diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..f91f64602e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore index cda5bab2ea..4001fca91a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,11 @@ donkey/donkey-test .sonar **/junit-reports **/code-coverage-reports +.gradle +.vscode +build +*.classpath +*.project # /client/ /client/logs @@ -600,6 +605,7 @@ donkey/donkey-test # /simplesender/src/com/mirth/connect/simplesender/ # /webadmin/ +/webadmin/bin /webadmin/build /webadmin/dist @@ -635,3 +641,4 @@ donkey/donkey-test # /webadmin/src/com/mirth/connect/webadmin/utils/ +.aider* diff --git a/.sdkmanrc b/.sdkmanrc index 4f6817d132..7a93ebed33 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,4 +1,4 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below java=8.0.442.fx-zulu -ant=1.10.14 +ant=1.10.14 \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..78f6387b04 --- /dev/null +++ b/build.gradle @@ -0,0 +1,170 @@ +plugins { + id 'base' + id 'distribution' + id 'com.gradleup.shadow' version '8.3.6' +} + +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +allprojects { + group = 'com.mirth.connect' + version = '4.5.3' +} + +subprojects { + apply plugin: 'java' + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + + dependencies { + implementation 'commons-beanutils:commons-beanutils:1.9.4' + implementation 'commons-cli:commons-cli:1.2' // Older version + implementation 'commons-codec:commons-codec:1.16.0' + implementation 'commons-collections:commons-collections:3.2.2' // Very old, potential conflict with collections4 + implementation 'org.apache.commons:commons-collections4:4.4' + implementation 'org.apache.commons:commons-compress:1.24.0' + implementation 'org.apache.commons:commons-configuration2:2.8.0' + implementation 'org.apache.commons:commons-dbcp2:2.0.1' // Old + implementation 'commons-dbutils:commons-dbutils:1.7' + implementation 'org.apache.commons:commons-digester3:3.2' + implementation 'commons-el:commons-el:1.0' // Old, JSP related + implementation 'org.apache.commons:commons-email:1.3.1' // Check version + implementation 'commons-fileupload:commons-fileupload:1.5' + implementation 'commons-httpclient:commons-httpclient:3.0.1' // Very old Apache HttpClient 3.x + implementation 'commons-io:commons-io:2.13.0' + implementation 'commons-jxpath:commons-jxpath:1.3' + implementation 'org.apache.commons:commons-lang3:3.13.0' + implementation 'commons-logging:commons-logging:1.2' // Bridge, ensure single binding downstream + implementation 'org.apache.commons:commons-math3:3.0' // Old + implementation 'commons-net:commons-net:3.3' // Old + implementation 'org.apache.commons:commons-pool2:2.3' // Old + implementation 'org.apache.commons:commons-text:1.10.0' + implementation 'org.apache.commons:commons-vfs2:2.9.0' + implementation 'org.apache.httpcomponents:httpcore:4.4.13' + implementation 'org.apache.httpcomponents:httpmime:4.5.13' + implementation 'ca.juliusdavies:not-yet-commons-ssl:0.3.11' + + // RSyntaxTestArea + implementation 'com.fifesoft:rsyntaxtextarea:2.6.1' + implementation 'com.fifesoft:autocomplete:2.5.4' + implementation 'com.fifesoft:languagesupport:2.5.6' + + // Rhino (JavaScript engine) + implementation 'org.mozilla:rhino:1.7.13' + + implementation 'com.thoughtworks.xstream:xstream:1.4.20' + implementation 'xpp3:xpp3:1.1.4c' + implementation 'com.zaxxer:HikariCP:2.5.1' + implementation 'org.javassist:javassist:3.26.0-GA' + implementation 'org.apache.logging.log4j:log4j-core:2.17.2' + implementation 'org.apache.logging.log4j:log4j-api:2.17.2' + implementation 'org.apache.logging.log4j:log4j-1.2-api:2.17.2' + implementation 'org.slf4j:slf4j-api:1.7.30' + + // DB + implementation 'org.apache.derby:derby:10.10.2.0' + implementation 'org.apache.derby:derbytools:10.10.2.0' + implementation 'net.sourceforge.jtds:jtds:1.3.1' + implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8' + implementation 'com.mysql:mysql-connector-j:8.2.0' + implementation 'com.oracle.database.jdbc:ojdbc8:12.2.0.1' + implementation 'org.postgresql:postgresql:42.6.0' + + // --- Common Test Dependencies --- + testImplementation 'junit:junit:4.8.1' + testImplementation 'org.mockito:mockito-core:2.7.9' + testImplementation 'net.bytebuddy:byte-buddy:1.8.8' + testImplementation 'net.bytebuddy:byte-buddy-agent:1.8.8' + testImplementation 'org.objenesis:objenesis:2.5.1' + testImplementation 'org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b31' + testImplementation 'javax.inject:javax.inject:1' + + // xpp3 is transitive via xstream + testImplementation 'com.zaxxer:HikariCP:2.5.1' + testImplementation 'org.javassist:javassist:3.26.0-GA' + + // Provide Logging implementation & binding for tests + testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.17.2' + testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' + + // Velocity (Templating) + implementation 'org.apache.velocity:velocity-engine-core:2.3' + implementation 'org.apache.velocity.tools:velocity-tools-generic:3.1' + } + + tasks.withType(Jar.class).configureEach { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + tasks.withType(Tar.class).configureEach { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + tasks.withType(Zip.class).configureEach { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + tasks.withType(ShadowJar.class).configureEach { + zip64 = true + } +} + +distributions { + main { + evaluationDependsOnChildren() + distributionBaseName = 'OIE' + + contents { + // Resources + from('server/src/main/resources') + from('command/src/main/resources') + + into('client-lib') { + from(project(':client').getConfigurations().runtimeClasspath) + from(project(':command').getTasksByName('jar', false)) + from(project(':server').getTasksByName('cryptoJar', false)) + from(project(':server').getTasksByName('clientCoreJar', false)) + from(project(':server').getTasksByName('userutilSourcesJar', false)) + } + + into('cli-lib') { + from(project(':command').getConfigurations().runtimeClasspath) + from(project(':command').getTasksByName('jar', false)) + from(project(':server').getTasksByName('cryptoJar', false)) + from(project(':server').getTasksByName('clientCoreJar', false)) + } + + into('manager-lib') { + from(project(':manager').getConfigurations().runtimeClasspath) + from(project(':command').getTasksByName('jar', false)) + from(project(':server').getTasksByName('cryptoJar', false)) + from(project(':server').getTasksByName('clientCoreJar', false)) + } + + into('server-lib') { + from(project(':server').getConfigurations().runtimeClasspath) + from(project(':command').getTasksByName('jar', false)) + from(project(':server').getTasksByName('jar', false)) + from(project(':server').getTasksByName('cryptoJar', false)) + from(project(':server').getTasksByName('clientCoreJar', false)) + } + + into('extensions') { + from(project(':client').tasks.matching { Task task -> task.name ==~ /jar.*Client/ }) + } + + into('webapps') { + from (project('webadmin').getTasksByName('war', false)) + } + + from(project(':server').getTasksByName('shadowJar', false)) + from(project(':manager').getTasksByName('shadowJar', false)) + from(project(':command').getTasksByName('shadowJar', false)) + } + } +} \ No newline at end of file diff --git a/client/.classpath b/client/.classpath deleted file mode 100644 index 9d31d09ea5..0000000000 --- a/client/.classpath +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/.project b/client/.project deleted file mode 100644 index 26fbc4505e..0000000000 --- a/client/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Client - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/client/ant-build.xml b/client/ant-build.xml deleted file mode 100644 index d3df03cd45..0000000000 --- a/client/ant-build.xml +++ /dev/null @@ -1,375 +0,0 @@ - - - Mirth Client Build Help - ----------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle new file mode 100644 index 0000000000..b9fb72c1d9 --- /dev/null +++ b/client/build.gradle @@ -0,0 +1,139 @@ +/* + * Gradle build file for the Mirth Connect Client module. + * Automatically discovers and builds client extensions. + */ +plugins { + id 'java' +} + +description = 'OIE Client' + +// --- Configuration --- + +def buildProps = new Properties() +def srcDir = file("src/main/java") // Standard Gradle source dir assumption now +def resDir = file("src/main/resources") // Standard resources dir +def mainJarName = buildProps.getProperty('client.jar') // Should be mirth-client.jar + +// Mapping for cases where the source directory name differs from the desired extension name +// Key: Source directory name, Value: Desired extension name +// def extensionNameMapping = [ +// 'dimse': 'dicom' +// // Add other mappings here if needed, e.g., 'someDir': 'someExtensionName' +// ] + +// Base paths for extension discovery +def connectorsSrcBase = file(srcDir.path + '/com/mirth/connect/connectors') +def pluginsSrcBase = file(srcDir.path + '/com/mirth/connect/plugins') +def datatypesSrcBase = file(srcDir.path + '/com/mirth/connect/plugins/datatypes') + +// --- Discover Extensions --- + +// Function to scan a base directory and return details about found extensions +def findExtensions = { File baseDir, String typePath -> + def extensions = [] + if (baseDir.isDirectory()) { + baseDir.eachDir { dir -> + def dirName = dir.name + def extensionName = dirName // extensionNameMapping.getOrDefault(dirName, dirName) + def packagePath = "${typePath}/${dirName}".toString() // e.g., "com/mirth/connect/connectors/jdbc" + extensions << [name: extensionName, packagePath: packagePath, type: (typePath.contains('connectors') ? 'connector' : 'plugin')] + project.logger.info "Discovered extension: name='{}', packagePath='{}'", extensionName, packagePath + } + } else { + project.logger.warn "Extension base directory not found: {}", baseDir + } + return extensions +} + +// Combine discovered connectors and plugins +def discoveredExtensions = findExtensions(connectorsSrcBase, 'com/mirth/connect/connectors') + findExtensions(pluginsSrcBase, 'com/mirth/connect/plugins') + findExtensions(datatypesSrcBase, 'com/mirth/connect/plugins/datatypes') + +sourceSets { + main { + resources { + // Explicitly include non-java files previously under src/main/java + include 'log4j2.properties' + include 'com/mirth/connect/client/ui/images/**' + include 'com/mirth/connect/client/ui/components/rsta/*.properties' + include 'com/mirth/connect/client/ui/components/tag/*.html' + include 'com/mirth/connect/client/ui/components/tag/*.css' + include 'com/mirth/connect/client/ui/components/tag/*.js' + } + } +} + +dependencies { + implementation project(':donkey') + implementation project(':server') + + implementation 'org.netbeans.modules:org-netbeans-core:RELEASE250' + implementation 'org.netbeans:wizard:0.998.1' + implementation 'com.google.javaparser:com.springsource.japa.parser:1.0.7' + implementation 'net.imagej:ij:1.54p' + implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.50' + implementation 'org.swinglabs:swingx-core:1.6.2-2' + implementation 'com.miglayout:miglayout-swing:4.2' + implementation 'org.glassfish.jersey.core:jersey-client:2.22.1' + implementation 'com.kenai.nbpwr:com-sun-pdfview:1.0.5-201003191900' + implementation 'org.reflections:reflections:0.9.10' + implementation 'com.jgoodies:looks:2.2.2' + implementation 'org.eclipse.jetty:jetty-util:9.4.53.v20231009' + implementation 'software.amazon.awssdk:regions:2.15.28' + implementation 'org.quartz-scheduler:quartz:2.3.2' + implementation 'org.openjfx:javafx-controls:11.0.2' + implementation 'org.openjfx:javafx-swing:11.0.2' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' +} + +// --- Tasks --- + +tasks.named('jar', Jar) { + archiveBaseName = 'mirth-client' // Set base name without '.jar' + archiveVersion = project.version // Append version automatically + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + // Include core client classes and explicitly the base ConnectorClass + from(sourceSets.main.output) { + include 'com/mirth/connect/client/**' // Core UI, etc. + include 'org/**' // Dependencies bundled (e.g., fife, netbeans, syntax) + include 'com/mirth/connect/connectors/ConnectorClass.class' // The special include from Ant + + // Exclude all discovered extension packages + discoveredExtensions.each { ext -> + exclude "${ext.packagePath}/**" + } + } +} + +// Dynamically create JAR tasks for each discovered extension +def extensionJarTasks = [] +discoveredExtensions.each { ext -> + def taskName = "jar${ext.name.capitalize().replaceAll('-', '')}Client" // e.g., jarDicomClient, jarDatatypeDelimitedClient + project.logger.info "Registering extension JAR task: {} for {}", taskName, ext.name + + extensionJarTasks << tasks.register(taskName, Jar) { + group = 'Build' + description = "Builds the JAR for the ${ext.name} client extension." + archiveBaseName = ext.name // e.g., dicom, datatype-delimited + archiveAppendix = 'client' // -> dicom-client.jar + archiveVersion = '' // Keep version out of extension JAR names, like Ant + + // Place JAR in build/extensions// + destinationDirectory = layout.buildDirectory.dir("extensions/${ext.name}") + + // Include only the classes for this specific extension + from(sourceSets.main.output) { + include "${ext.packagePath}/**" + } + } +} + +// Ensure assemble depends on all extension tasks +tasks.named('assemble') { + extensionJarTasks.each { taskProvider -> + dependsOn(taskProvider) + } +} \ No newline at end of file diff --git a/client/build.properties b/client/build.properties deleted file mode 100644 index 4a6727c78b..0000000000 --- a/client/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -# top level directories -src=${basedir}/src -test=${basedir}/test -server=${basedir}/../server -donkey_src=${basedir}/../donkey/src/main/java -donkey_lib=${basedir}/../donkey/lib -classes=${basedir}/classes -test_classes=${basedir}/test_classes -lib=${basedir}/lib -logs=${basedir}/logs -dist=${basedir}/dist - -# jars -client.jar=mirth-client.jar \ No newline at end of file diff --git a/client/src/com/mirth/connect/client/ui/AboutMirth.form b/client/src/main/java/com/mirth/connect/client/ui/AboutMirth.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/AboutMirth.form rename to client/src/main/java/com/mirth/connect/client/ui/AboutMirth.form diff --git a/client/src/com/mirth/connect/client/ui/AboutMirth.java b/client/src/main/java/com/mirth/connect/client/ui/AboutMirth.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AboutMirth.java rename to client/src/main/java/com/mirth/connect/client/ui/AboutMirth.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractChannelTabPanel.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractChannelTabPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractChannelTabPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractChannelTabPanel.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractChannelTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractChannelTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractChannelTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractChannelTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractConnectorPropertiesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractConnectorPropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractConnectorPropertiesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractConnectorPropertiesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractDashboardTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractDashboardTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractDashboardTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractDashboardTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractFramePanel.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractFramePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractFramePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractFramePanel.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/AbstractSortableTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/AbstractSortableTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AbstractSortableTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/AbstractSortableTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/AttachmentExportDialog.java b/client/src/main/java/com/mirth/connect/client/ui/AttachmentExportDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AttachmentExportDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/AttachmentExportDialog.java diff --git a/client/src/com/mirth/connect/client/ui/AuthorizationController.java b/client/src/main/java/com/mirth/connect/client/ui/AuthorizationController.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AuthorizationController.java rename to client/src/main/java/com/mirth/connect/client/ui/AuthorizationController.java diff --git a/client/src/com/mirth/connect/client/ui/AuthorizationControllerFactory.java b/client/src/main/java/com/mirth/connect/client/ui/AuthorizationControllerFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/AuthorizationControllerFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/AuthorizationControllerFactory.java diff --git a/client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java b/client/src/main/java/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java rename to client/src/main/java/com/mirth/connect/client/ui/BareBonesBrowserLaunch.java diff --git a/client/src/com/mirth/connect/client/ui/ByteAbbreviationList.form b/client/src/main/java/com/mirth/connect/client/ui/ByteAbbreviationList.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ByteAbbreviationList.form rename to client/src/main/java/com/mirth/connect/client/ui/ByteAbbreviationList.form diff --git a/client/src/com/mirth/connect/client/ui/ByteAbbreviationList.java b/client/src/main/java/com/mirth/connect/client/ui/ByteAbbreviationList.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ByteAbbreviationList.java rename to client/src/main/java/com/mirth/connect/client/ui/ByteAbbreviationList.java diff --git a/client/src/com/mirth/connect/client/ui/CellData.java b/client/src/main/java/com/mirth/connect/client/ui/CellData.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CellData.java rename to client/src/main/java/com/mirth/connect/client/ui/CellData.java diff --git a/client/src/com/mirth/connect/client/ui/CenterCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/CenterCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CenterCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/CenterCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/ChangePasswordDialog.form b/client/src/main/java/com/mirth/connect/client/ui/ChangePasswordDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChangePasswordDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/ChangePasswordDialog.form diff --git a/client/src/com/mirth/connect/client/ui/ChangePasswordDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ChangePasswordDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChangePasswordDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ChangePasswordDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelDependenciesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelDependenciesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelDependenciesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelDependenciesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelFilter.form b/client/src/main/java/com/mirth/connect/client/ui/ChannelFilter.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelFilter.form rename to client/src/main/java/com/mirth/connect/client/ui/ChannelFilter.form diff --git a/client/src/com/mirth/connect/client/ui/ChannelGroupStatus.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelGroupStatus.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelGroupStatus.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelGroupStatus.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelPanel.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelPanel.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelSetup.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelSetup.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelSetup.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelSetup.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelTableColumnFactory.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelTableColumnFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTableColumnFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTableColumnFactory.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelTableNameEntry.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelTableNameEntry.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTableNameEntry.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTableNameEntry.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelTableNodeFactory.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelTableNodeFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTableNodeFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTableNodeFactory.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelTagDialog.form b/client/src/main/java/com/mirth/connect/client/ui/ChannelTagDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTagDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTagDialog.form diff --git a/client/src/com/mirth/connect/client/ui/ChannelTreeTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelTreeTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelTreeTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelTreeTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/ChannelWizard.form b/client/src/main/java/com/mirth/connect/client/ui/ChannelWizard.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelWizard.form rename to client/src/main/java/com/mirth/connect/client/ui/ChannelWizard.form diff --git a/client/src/com/mirth/connect/client/ui/ChannelWizard.java b/client/src/main/java/com/mirth/connect/client/ui/ChannelWizard.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ChannelWizard.java rename to client/src/main/java/com/mirth/connect/client/ui/ChannelWizard.java diff --git a/client/src/com/mirth/connect/client/ui/CharsetEncodingInformation.java b/client/src/main/java/com/mirth/connect/client/ui/CharsetEncodingInformation.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CharsetEncodingInformation.java rename to client/src/main/java/com/mirth/connect/client/ui/CharsetEncodingInformation.java diff --git a/client/src/com/mirth/connect/client/ui/CodeTemplatePanel.form b/client/src/main/java/com/mirth/connect/client/ui/CodeTemplatePanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/CodeTemplatePanel.form rename to client/src/main/java/com/mirth/connect/client/ui/CodeTemplatePanel.form diff --git a/client/src/com/mirth/connect/client/ui/ConnectorTypeCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ConnectorTypeCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/ConnectorTypeData.java b/client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeData.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ConnectorTypeData.java rename to client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeData.java diff --git a/client/src/com/mirth/connect/client/ui/ConnectorTypeDecoration.java b/client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeDecoration.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ConnectorTypeDecoration.java rename to client/src/main/java/com/mirth/connect/client/ui/ConnectorTypeDecoration.java diff --git a/client/src/com/mirth/connect/client/ui/CustomAttachmentDialog.form b/client/src/main/java/com/mirth/connect/client/ui/CustomAttachmentDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/CustomAttachmentDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/CustomAttachmentDialog.form diff --git a/client/src/com/mirth/connect/client/ui/CustomBannerPanelDialog.java b/client/src/main/java/com/mirth/connect/client/ui/CustomBannerPanelDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CustomBannerPanelDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/CustomBannerPanelDialog.java diff --git a/client/src/com/mirth/connect/client/ui/CustomErrorDialog.form b/client/src/main/java/com/mirth/connect/client/ui/CustomErrorDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/CustomErrorDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/CustomErrorDialog.form diff --git a/client/src/com/mirth/connect/client/ui/CustomErrorDialog.java b/client/src/main/java/com/mirth/connect/client/ui/CustomErrorDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CustomErrorDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/CustomErrorDialog.java diff --git a/client/src/com/mirth/connect/client/ui/CustomMetaDataDialog.form b/client/src/main/java/com/mirth/connect/client/ui/CustomMetaDataDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/CustomMetaDataDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/CustomMetaDataDialog.form diff --git a/client/src/com/mirth/connect/client/ui/DashboardPanel.java b/client/src/main/java/com/mirth/connect/client/ui/DashboardPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DashboardPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/DashboardPanel.java diff --git a/client/src/com/mirth/connect/client/ui/DashboardTableColumnFactory.java b/client/src/main/java/com/mirth/connect/client/ui/DashboardTableColumnFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DashboardTableColumnFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/DashboardTableColumnFactory.java diff --git a/client/src/com/mirth/connect/client/ui/DashboardTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/DashboardTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DashboardTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/DashboardTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/DashboardTableNodeFactory.java b/client/src/main/java/com/mirth/connect/client/ui/DashboardTableNodeFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DashboardTableNodeFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/DashboardTableNodeFactory.java diff --git a/client/src/com/mirth/connect/client/ui/DashboardTreeTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/DashboardTreeTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DashboardTreeTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/DashboardTreeTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypeColumnFactory.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypeColumnFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypeColumnFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypeColumnFactory.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypeConnectorTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypeConnectorTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypeConnectorTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypeConnectorTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypeConnectorTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypeConnectorTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypeConnectorTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypeConnectorTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypeNodeDescriptor.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypeNodeDescriptor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypeNodeDescriptor.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypeNodeDescriptor.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesContainer.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesContainer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesContainer.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesContainer.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesPanel.form b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesPanel.form diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypePropertiesTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypePropertiesTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypePropertiesTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/DataTypesDialog.form b/client/src/main/java/com/mirth/connect/client/ui/DataTypesDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypesDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/DataTypesDialog.form diff --git a/client/src/com/mirth/connect/client/ui/DataTypesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/DataTypesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DataTypesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/DataTypesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/DateCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/DateCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DateCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/DateCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/DefaultAuthorizationController.java b/client/src/main/java/com/mirth/connect/client/ui/DefaultAuthorizationController.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DefaultAuthorizationController.java rename to client/src/main/java/com/mirth/connect/client/ui/DefaultAuthorizationController.java diff --git a/client/src/com/mirth/connect/client/ui/DeleteStatisticsDialog.form b/client/src/main/java/com/mirth/connect/client/ui/DeleteStatisticsDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/DeleteStatisticsDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/DeleteStatisticsDialog.form diff --git a/client/src/com/mirth/connect/client/ui/DeleteStatisticsDialog.java b/client/src/main/java/com/mirth/connect/client/ui/DeleteStatisticsDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DeleteStatisticsDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/DeleteStatisticsDialog.java diff --git a/client/src/com/mirth/connect/client/ui/DeployInDebugModeDialog.java b/client/src/main/java/com/mirth/connect/client/ui/DeployInDebugModeDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DeployInDebugModeDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/DeployInDebugModeDialog.java diff --git a/client/src/com/mirth/connect/client/ui/DestinationTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/DestinationTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/DestinationTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/DestinationTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/EditMessageDialog.form b/client/src/main/java/com/mirth/connect/client/ui/EditMessageDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/EditMessageDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/EditMessageDialog.form diff --git a/client/src/com/mirth/connect/client/ui/EditMessageDialog.java b/client/src/main/java/com/mirth/connect/client/ui/EditMessageDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/EditMessageDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/EditMessageDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ErrorDialog.form b/client/src/main/java/com/mirth/connect/client/ui/ErrorDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ErrorDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/ErrorDialog.form diff --git a/client/src/com/mirth/connect/client/ui/ErrorDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ErrorDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ErrorDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ErrorDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ExportChannelLibrariesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ExportChannelLibrariesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ExportChannelLibrariesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ExportChannelLibrariesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/FilterDialog.form b/client/src/main/java/com/mirth/connect/client/ui/FilterDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/FilterDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/FilterDialog.form diff --git a/client/src/com/mirth/connect/client/ui/FilterDialog.java b/client/src/main/java/com/mirth/connect/client/ui/FilterDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/FilterDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/FilterDialog.java diff --git a/client/src/com/mirth/connect/client/ui/FindRplDialog.form b/client/src/main/java/com/mirth/connect/client/ui/FindRplDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/FindRplDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/FindRplDialog.form diff --git a/client/src/com/mirth/connect/client/ui/FindRplDialog.java b/client/src/main/java/com/mirth/connect/client/ui/FindRplDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/FindRplDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/FindRplDialog.java diff --git a/client/src/com/mirth/connect/client/ui/FirstLoginDialog.form b/client/src/main/java/com/mirth/connect/client/ui/FirstLoginDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/FirstLoginDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/FirstLoginDialog.form diff --git a/client/src/com/mirth/connect/client/ui/FirstLoginDialog.java b/client/src/main/java/com/mirth/connect/client/ui/FirstLoginDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/FirstLoginDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/FirstLoginDialog.java diff --git a/client/src/com/mirth/connect/client/ui/Frame.java b/client/src/main/java/com/mirth/connect/client/ui/Frame.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/Frame.java rename to client/src/main/java/com/mirth/connect/client/ui/Frame.java diff --git a/client/src/com/mirth/connect/client/ui/FunctionList.form b/client/src/main/java/com/mirth/connect/client/ui/FunctionList.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/FunctionList.form rename to client/src/main/java/com/mirth/connect/client/ui/FunctionList.form diff --git a/client/src/com/mirth/connect/client/ui/FunctionList.java b/client/src/main/java/com/mirth/connect/client/ui/FunctionList.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/FunctionList.java rename to client/src/main/java/com/mirth/connect/client/ui/FunctionList.java diff --git a/client/src/com/mirth/connect/client/ui/GlobalScriptsPanel.form b/client/src/main/java/com/mirth/connect/client/ui/GlobalScriptsPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/GlobalScriptsPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/GlobalScriptsPanel.form diff --git a/client/src/com/mirth/connect/client/ui/GlobalScriptsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/GlobalScriptsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/GlobalScriptsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/GlobalScriptsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/ImageCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/ImageCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ImageCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/ImageCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/JavaScriptAttachmentDialog.form b/client/src/main/java/com/mirth/connect/client/ui/JavaScriptAttachmentDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/JavaScriptAttachmentDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/JavaScriptAttachmentDialog.form diff --git a/client/src/com/mirth/connect/client/ui/LibraryResourcesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/LibraryResourcesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/LibraryResourcesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/LibraryResourcesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/LicenseClient.java b/client/src/main/java/com/mirth/connect/client/ui/LicenseClient.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/LicenseClient.java rename to client/src/main/java/com/mirth/connect/client/ui/LicenseClient.java diff --git a/client/src/com/mirth/connect/client/ui/LoadedExtensions.java b/client/src/main/java/com/mirth/connect/client/ui/LoadedExtensions.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/LoadedExtensions.java rename to client/src/main/java/com/mirth/connect/client/ui/LoadedExtensions.java diff --git a/client/src/com/mirth/connect/client/ui/LoginPanel.form b/client/src/main/java/com/mirth/connect/client/ui/LoginPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/LoginPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/LoginPanel.form diff --git a/client/src/com/mirth/connect/client/ui/LoginPanel.java b/client/src/main/java/com/mirth/connect/client/ui/LoginPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/LoginPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/LoginPanel.java diff --git a/client/src/com/mirth/connect/client/ui/MapperDropData.java b/client/src/main/java/com/mirth/connect/client/ui/MapperDropData.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MapperDropData.java rename to client/src/main/java/com/mirth/connect/client/ui/MapperDropData.java diff --git a/client/src/com/mirth/connect/client/ui/MessageBuilderDropData.java b/client/src/main/java/com/mirth/connect/client/ui/MessageBuilderDropData.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MessageBuilderDropData.java rename to client/src/main/java/com/mirth/connect/client/ui/MessageBuilderDropData.java diff --git a/client/src/com/mirth/connect/client/ui/MessageExportDialog.java b/client/src/main/java/com/mirth/connect/client/ui/MessageExportDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MessageExportDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/MessageExportDialog.java diff --git a/client/src/com/mirth/connect/client/ui/MessageImportDialog.java b/client/src/main/java/com/mirth/connect/client/ui/MessageImportDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MessageImportDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/MessageImportDialog.java diff --git a/client/src/com/mirth/connect/client/ui/Mirth.java b/client/src/main/java/com/mirth/connect/client/ui/Mirth.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/Mirth.java rename to client/src/main/java/com/mirth/connect/client/ui/Mirth.java diff --git a/client/src/com/mirth/connect/client/ui/MirthDialog.java b/client/src/main/java/com/mirth/connect/client/ui/MirthDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MirthDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/MirthDialog.java diff --git a/client/src/com/mirth/connect/client/ui/MirthFileFilter.java b/client/src/main/java/com/mirth/connect/client/ui/MirthFileFilter.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MirthFileFilter.java rename to client/src/main/java/com/mirth/connect/client/ui/MirthFileFilter.java diff --git a/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.form b/client/src/main/java/com/mirth/connect/client/ui/MirthHeadingPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/MirthHeadingPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/MirthHeadingPanel.form diff --git a/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java b/client/src/main/java/com/mirth/connect/client/ui/MirthHeadingPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/MirthHeadingPanel.java diff --git a/client/src/com/mirth/connect/client/ui/MirthTheme.java b/client/src/main/java/com/mirth/connect/client/ui/MirthTheme.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/MirthTheme.java rename to client/src/main/java/com/mirth/connect/client/ui/MirthTheme.java diff --git a/client/src/com/mirth/connect/client/ui/NotificationDialog.java b/client/src/main/java/com/mirth/connect/client/ui/NotificationDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/NotificationDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/NotificationDialog.java diff --git a/client/src/com/mirth/connect/client/ui/NumberCellComparator.java b/client/src/main/java/com/mirth/connect/client/ui/NumberCellComparator.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/NumberCellComparator.java rename to client/src/main/java/com/mirth/connect/client/ui/NumberCellComparator.java diff --git a/client/src/com/mirth/connect/client/ui/NumberCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/NumberCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/NumberCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/NumberCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/OSXAdapter.java b/client/src/main/java/com/mirth/connect/client/ui/OSXAdapter.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/OSXAdapter.java rename to client/src/main/java/com/mirth/connect/client/ui/OSXAdapter.java diff --git a/client/src/com/mirth/connect/client/ui/OffsetRowSorter.java b/client/src/main/java/com/mirth/connect/client/ui/OffsetRowSorter.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/OffsetRowSorter.java rename to client/src/main/java/com/mirth/connect/client/ui/OffsetRowSorter.java diff --git a/client/src/com/mirth/connect/client/ui/PlatformUI.java b/client/src/main/java/com/mirth/connect/client/ui/PlatformUI.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/PlatformUI.java rename to client/src/main/java/com/mirth/connect/client/ui/PlatformUI.java diff --git a/client/src/com/mirth/connect/client/ui/QueuingSwingWorker.java b/client/src/main/java/com/mirth/connect/client/ui/QueuingSwingWorker.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/QueuingSwingWorker.java rename to client/src/main/java/com/mirth/connect/client/ui/QueuingSwingWorker.java diff --git a/client/src/com/mirth/connect/client/ui/QueuingSwingWorkerTask.java b/client/src/main/java/com/mirth/connect/client/ui/QueuingSwingWorkerTask.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/QueuingSwingWorkerTask.java rename to client/src/main/java/com/mirth/connect/client/ui/QueuingSwingWorkerTask.java diff --git a/client/src/com/mirth/connect/client/ui/RefreshTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/RefreshTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/RefreshTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/RefreshTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/RemoveMessagesDialog.form b/client/src/main/java/com/mirth/connect/client/ui/RemoveMessagesDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/RemoveMessagesDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/RemoveMessagesDialog.form diff --git a/client/src/com/mirth/connect/client/ui/RemoveMessagesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/RemoveMessagesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/RemoveMessagesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/RemoveMessagesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ReprocessMessagesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ReprocessMessagesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ReprocessMessagesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ReprocessMessagesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/ResourcePropertiesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/ResourcePropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ResourcePropertiesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/ResourcePropertiesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/RuleDropData.java b/client/src/main/java/com/mirth/connect/client/ui/RuleDropData.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/RuleDropData.java rename to client/src/main/java/com/mirth/connect/client/ui/RuleDropData.java diff --git a/client/src/com/mirth/connect/client/ui/ScriptPanel.java b/client/src/main/java/com/mirth/connect/client/ui/ScriptPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ScriptPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/ScriptPanel.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPane.form b/client/src/main/java/com/mirth/connect/client/ui/SettingsPane.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPane.form rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPane.form diff --git a/client/src/com/mirth/connect/client/ui/SettingsPane.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPane.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPane.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPanelAdministrator.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPanelAdministrator.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPanelAdministrator.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPanelAdministrator.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPanelDatabaseTasks.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPanelDatabaseTasks.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPanelDatabaseTasks.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPanelDatabaseTasks.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPanelMap.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPanelMap.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPanelMap.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPanelMap.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPanelResources.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPanelResources.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPanelResources.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPanelResources.java diff --git a/client/src/com/mirth/connect/client/ui/SettingsPanelServer.java b/client/src/main/java/com/mirth/connect/client/ui/SettingsPanelServer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SettingsPanelServer.java rename to client/src/main/java/com/mirth/connect/client/ui/SettingsPanelServer.java diff --git a/client/src/com/mirth/connect/client/ui/SortableHeaderCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/SortableHeaderCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SortableHeaderCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/SortableHeaderCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/SortableTreeTable.java b/client/src/main/java/com/mirth/connect/client/ui/SortableTreeTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SortableTreeTable.java rename to client/src/main/java/com/mirth/connect/client/ui/SortableTreeTable.java diff --git a/client/src/com/mirth/connect/client/ui/SortableTreeTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/SortableTreeTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/SortableTreeTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/SortableTreeTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/StatusBar.form b/client/src/main/java/com/mirth/connect/client/ui/StatusBar.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/StatusBar.form rename to client/src/main/java/com/mirth/connect/client/ui/StatusBar.form diff --git a/client/src/com/mirth/connect/client/ui/StatusBar.java b/client/src/main/java/com/mirth/connect/client/ui/StatusBar.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/StatusBar.java rename to client/src/main/java/com/mirth/connect/client/ui/StatusBar.java diff --git a/client/src/com/mirth/connect/client/ui/StatusUpdater.java b/client/src/main/java/com/mirth/connect/client/ui/StatusUpdater.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/StatusUpdater.java rename to client/src/main/java/com/mirth/connect/client/ui/StatusUpdater.java diff --git a/client/src/com/mirth/connect/client/ui/TagTreeCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/TagTreeCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TagTreeCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/TagTreeCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/TemplatePanel.form b/client/src/main/java/com/mirth/connect/client/ui/TemplatePanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/TemplatePanel.form rename to client/src/main/java/com/mirth/connect/client/ui/TemplatePanel.form diff --git a/client/src/com/mirth/connect/client/ui/TemplatePanel.java b/client/src/main/java/com/mirth/connect/client/ui/TemplatePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TemplatePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/TemplatePanel.java diff --git a/client/src/com/mirth/connect/client/ui/TextFieldCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/TextFieldCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TextFieldCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/TextFieldCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/TransformerType.java b/client/src/main/java/com/mirth/connect/client/ui/TransformerType.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TransformerType.java rename to client/src/main/java/com/mirth/connect/client/ui/TransformerType.java diff --git a/client/src/com/mirth/connect/client/ui/TreeNodeFlavor.java b/client/src/main/java/com/mirth/connect/client/ui/TreeNodeFlavor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TreeNodeFlavor.java rename to client/src/main/java/com/mirth/connect/client/ui/TreeNodeFlavor.java diff --git a/client/src/com/mirth/connect/client/ui/TreePanel.form b/client/src/main/java/com/mirth/connect/client/ui/TreePanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/TreePanel.form rename to client/src/main/java/com/mirth/connect/client/ui/TreePanel.form diff --git a/client/src/com/mirth/connect/client/ui/TreePanel.java b/client/src/main/java/com/mirth/connect/client/ui/TreePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TreePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/TreePanel.java diff --git a/client/src/com/mirth/connect/client/ui/TreeTransferable.java b/client/src/main/java/com/mirth/connect/client/ui/TreeTransferable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/TreeTransferable.java rename to client/src/main/java/com/mirth/connect/client/ui/TreeTransferable.java diff --git a/client/src/com/mirth/connect/client/ui/UIConstants.java b/client/src/main/java/com/mirth/connect/client/ui/UIConstants.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/UIConstants.java rename to client/src/main/java/com/mirth/connect/client/ui/UIConstants.java diff --git a/client/src/com/mirth/connect/client/ui/UserDialog.form b/client/src/main/java/com/mirth/connect/client/ui/UserDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/UserDialog.form diff --git a/client/src/com/mirth/connect/client/ui/UserDialog.java b/client/src/main/java/com/mirth/connect/client/ui/UserDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/UserDialog.java diff --git a/client/src/com/mirth/connect/client/ui/UserDialogInterface.java b/client/src/main/java/com/mirth/connect/client/ui/UserDialogInterface.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserDialogInterface.java rename to client/src/main/java/com/mirth/connect/client/ui/UserDialogInterface.java diff --git a/client/src/com/mirth/connect/client/ui/UserEditPanel.java b/client/src/main/java/com/mirth/connect/client/ui/UserEditPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserEditPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/UserEditPanel.java diff --git a/client/src/com/mirth/connect/client/ui/UserPanel.form b/client/src/main/java/com/mirth/connect/client/ui/UserPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/UserPanel.form diff --git a/client/src/com/mirth/connect/client/ui/UserPanel.java b/client/src/main/java/com/mirth/connect/client/ui/UserPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/UserPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/UserPanel.java diff --git a/client/src/com/mirth/connect/client/ui/VariableList.form b/client/src/main/java/com/mirth/connect/client/ui/VariableList.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/VariableList.form rename to client/src/main/java/com/mirth/connect/client/ui/VariableList.form diff --git a/client/src/com/mirth/connect/client/ui/VariableList.java b/client/src/main/java/com/mirth/connect/client/ui/VariableList.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/VariableList.java rename to client/src/main/java/com/mirth/connect/client/ui/VariableList.java diff --git a/client/src/com/mirth/connect/client/ui/VariableListHandler.java b/client/src/main/java/com/mirth/connect/client/ui/VariableListHandler.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/VariableListHandler.java rename to client/src/main/java/com/mirth/connect/client/ui/VariableListHandler.java diff --git a/client/src/com/mirth/connect/client/ui/VariableTransferable.java b/client/src/main/java/com/mirth/connect/client/ui/VariableTransferable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/VariableTransferable.java rename to client/src/main/java/com/mirth/connect/client/ui/VariableTransferable.java diff --git a/client/src/com/mirth/connect/client/ui/ViewContentDialog.form b/client/src/main/java/com/mirth/connect/client/ui/ViewContentDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/ViewContentDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/ViewContentDialog.form diff --git a/client/src/com/mirth/connect/client/ui/ViewContentDialog.java b/client/src/main/java/com/mirth/connect/client/ui/ViewContentDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/ViewContentDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/ViewContentDialog.java diff --git a/client/src/com/mirth/connect/client/ui/actions/CopyAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/CopyAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/CopyAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/CopyAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/CutAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/CutAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/CutAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/CutAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/DeleteAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/DeleteAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/DeleteAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/DeleteAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/FindAndReplaceAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/FindAndReplaceAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/FindAndReplaceAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/FindAndReplaceAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/PasteAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/PasteAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/PasteAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/PasteAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/RedoAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/RedoAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/RedoAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/RedoAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/SelectAllAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/SelectAllAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/SelectAllAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/SelectAllAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/ShowLineEndingsAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/ShowLineEndingsAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/ShowLineEndingsAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/ShowLineEndingsAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/SnippetAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/SnippetAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/SnippetAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/SnippetAction.java diff --git a/client/src/com/mirth/connect/client/ui/actions/UndoAction.java b/client/src/main/java/com/mirth/connect/client/ui/actions/UndoAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/actions/UndoAction.java rename to client/src/main/java/com/mirth/connect/client/ui/actions/UndoAction.java diff --git a/client/src/com/mirth/connect/client/ui/alert/AlertActionPane.java b/client/src/main/java/com/mirth/connect/client/ui/alert/AlertActionPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/AlertActionPane.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/AlertActionPane.java diff --git a/client/src/com/mirth/connect/client/ui/alert/AlertChannelPane.java b/client/src/main/java/com/mirth/connect/client/ui/alert/AlertChannelPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/AlertChannelPane.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/AlertChannelPane.java diff --git a/client/src/com/mirth/connect/client/ui/alert/AlertEditPanel.java b/client/src/main/java/com/mirth/connect/client/ui/alert/AlertEditPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/AlertEditPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/AlertEditPanel.java diff --git a/client/src/com/mirth/connect/client/ui/alert/AlertPanel.java b/client/src/main/java/com/mirth/connect/client/ui/alert/AlertPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/AlertPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/AlertPanel.java diff --git a/client/src/com/mirth/connect/client/ui/alert/AlertTriggerPane.java b/client/src/main/java/com/mirth/connect/client/ui/alert/AlertTriggerPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/AlertTriggerPane.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/AlertTriggerPane.java diff --git a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java b/client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertEditPanel.java diff --git a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertPanel.java b/client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/DefaultAlertPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertPanel.java diff --git a/client/src/com/mirth/connect/client/ui/alert/DefaultAlertTriggerPane.java b/client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertTriggerPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/alert/DefaultAlertTriggerPane.java rename to client/src/main/java/com/mirth/connect/client/ui/alert/DefaultAlertTriggerPane.java diff --git a/client/src/com/mirth/connect/client/ui/attachments/AttachmentTypeDialog.java b/client/src/main/java/com/mirth/connect/client/ui/attachments/AttachmentTypeDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/attachments/AttachmentTypeDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/attachments/AttachmentTypeDialog.java diff --git a/client/src/com/mirth/connect/client/ui/attachments/CustomAttachmentDialog.java b/client/src/main/java/com/mirth/connect/client/ui/attachments/CustomAttachmentDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/attachments/CustomAttachmentDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/attachments/CustomAttachmentDialog.java diff --git a/client/src/com/mirth/connect/client/ui/attachments/IdentityAttachmentDialog.java b/client/src/main/java/com/mirth/connect/client/ui/attachments/IdentityAttachmentDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/attachments/IdentityAttachmentDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/attachments/IdentityAttachmentDialog.java diff --git a/client/src/com/mirth/connect/client/ui/attachments/JavaScriptAttachmentDialog.java b/client/src/main/java/com/mirth/connect/client/ui/attachments/JavaScriptAttachmentDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/attachments/JavaScriptAttachmentDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/attachments/JavaScriptAttachmentDialog.java diff --git a/client/src/com/mirth/connect/client/ui/attachments/RegexAttachmentDialog.java b/client/src/main/java/com/mirth/connect/client/ui/attachments/RegexAttachmentDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/attachments/RegexAttachmentDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/attachments/RegexAttachmentDialog.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.form b/client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowser.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.form rename to client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowser.form diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowser.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowser.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.form b/client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.form rename to client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.form diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/event/EventBrowserAdvancedFilter.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.form b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowser.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.form rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowser.form diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.form b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.form rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.form diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserAdvancedFilter.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserChannelModel.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserChannelModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserChannelModel.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserChannelModel.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableColumnFactory.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableColumnFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableColumnFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableColumnFactory.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/browsers/message/MessageBrowserTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/BasicCodeTemplatePropertiesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/BasicCodeTemplatePropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/BasicCodeTemplatePropertiesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/BasicCodeTemplatePropertiesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateImportDialog.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateImportDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateImportDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateImportDialog.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibrariesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibrariesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibrariesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibrariesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibraryTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibraryTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibraryTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateLibraryTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplatePanel.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplatePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplatePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplatePanel.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplatePropertiesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplatePropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplatePropertiesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplatePropertiesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateRootTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateRootTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateRootTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateRootTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTableColumnFactory.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTableColumnFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTableColumnFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTableColumnFactory.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/CodeTemplateTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/codetemplate/ContextTreeTableCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/ChannelInfo.java b/client/src/main/java/com/mirth/connect/client/ui/components/ChannelInfo.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ChannelInfo.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ChannelInfo.java diff --git a/client/src/com/mirth/connect/client/ui/components/ChannelTableTransferHandler.java b/client/src/main/java/com/mirth/connect/client/ui/components/ChannelTableTransferHandler.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ChannelTableTransferHandler.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ChannelTableTransferHandler.java diff --git a/client/src/com/mirth/connect/client/ui/components/ChannelTableTransferable.java b/client/src/main/java/com/mirth/connect/client/ui/components/ChannelTableTransferable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ChannelTableTransferable.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ChannelTableTransferable.java diff --git a/client/src/com/mirth/connect/client/ui/components/ChannelsTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/components/ChannelsTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ChannelsTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ChannelsTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/components/ChannelsTableCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/ChannelsTableCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ChannelsTableCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ChannelsTableCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/IconButton.java b/client/src/main/java/com/mirth/connect/client/ui/components/IconButton.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/IconButton.java rename to client/src/main/java/com/mirth/connect/client/ui/components/IconButton.java diff --git a/client/src/com/mirth/connect/client/ui/components/IconToggleButton.java b/client/src/main/java/com/mirth/connect/client/ui/components/IconToggleButton.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/IconToggleButton.java rename to client/src/main/java/com/mirth/connect/client/ui/components/IconToggleButton.java diff --git a/client/src/com/mirth/connect/client/ui/components/ItemSelectionTable.java b/client/src/main/java/com/mirth/connect/client/ui/components/ItemSelectionTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ItemSelectionTable.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ItemSelectionTable.java diff --git a/client/src/com/mirth/connect/client/ui/components/ItemSelectionTableModel.java b/client/src/main/java/com/mirth/connect/client/ui/components/ItemSelectionTableModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/ItemSelectionTableModel.java rename to client/src/main/java/com/mirth/connect/client/ui/components/ItemSelectionTableModel.java diff --git a/client/src/com/mirth/connect/client/ui/components/KeyStrokeTextField.java b/client/src/main/java/com/mirth/connect/client/ui/components/KeyStrokeTextField.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/KeyStrokeTextField.java rename to client/src/main/java/com/mirth/connect/client/ui/components/KeyStrokeTextField.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerEditor.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinnerEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinnerEditor.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthButton.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthButton.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthButton.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthButton.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthButtonCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthButtonCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthButtonCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthButtonCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthButtonCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthButtonCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthButtonCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthButtonCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthCheckBox.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthCheckBox.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthCheckBox.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthCheckBox.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthComboBox.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBox.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthComboBox.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBox.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthComboBoxTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBoxTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthComboBoxTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBoxTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthComboBoxTableCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBoxTableCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthComboBoxTableCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthComboBoxTableCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthDatePicker.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthDatePicker.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthDatePicker.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthDatePicker.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthDialogTableCellEditor.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthDialogTableCellEditor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthDialogTableCellEditor.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthDialogTableCellEditor.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthEditableComboBox.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthEditableComboBox.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthEditableComboBox.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthEditableComboBox.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthFieldConstraints.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthFieldConstraints.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthFieldConstraints.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthFieldConstraints.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthIconTextField.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthIconTextField.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthIconTextField.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthIconTextField.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthPasswordField.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthPasswordField.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthPasswordField.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthPasswordField.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthPasswordTableCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthPasswordTableCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthPasswordTableCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthPasswordTableCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthPropertiesTable.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthPropertiesTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthPropertiesTable.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthPropertiesTable.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthRadioButton.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthRadioButton.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthRadioButton.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthRadioButton.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthSyntaxTextArea.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthSyntaxTextArea.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthSyntaxTextArea.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthSyntaxTextArea.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTable.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTable.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTable.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTableTransferHandler.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTableTransferHandler.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTableTransferHandler.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTableTransferHandler.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTextArea.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTextArea.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTextArea.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTextArea.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTextField.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTextField.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTextField.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTextField.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTextIcon.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTextIcon.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTextIcon.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTextIcon.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTextInterface.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTextInterface.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTextInterface.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTextInterface.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTextPane.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTextPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTextPane.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTextPane.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTimePicker.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTimePicker.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTimePicker.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTimePicker.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTree.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTree.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTree.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTree.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTreeNode.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTreeNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTreeNode.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTreeNode.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTreeTable.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTreeTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTreeTable.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTreeTable.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthTriStateCheckBox.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthTriStateCheckBox.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthTriStateCheckBox.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthTriStateCheckBox.java diff --git a/client/src/com/mirth/connect/client/ui/components/MirthVariableList.java b/client/src/main/java/com/mirth/connect/client/ui/components/MirthVariableList.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/MirthVariableList.java rename to client/src/main/java/com/mirth/connect/client/ui/components/MirthVariableList.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/AutoCompleteProperties.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/AutoCompleteProperties.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/AutoCompleteProperties.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/AutoCompleteProperties.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/CustomJCheckBoxMenuItem.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/CustomJCheckBoxMenuItem.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/CustomJCheckBoxMenuItem.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/CustomJCheckBoxMenuItem.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/CustomMenuItem.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/CustomMenuItem.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/CustomMenuItem.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/CustomMenuItem.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/FindReplaceDialog.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/FindReplaceDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/FindReplaceDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/FindReplaceDialog.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/FindReplaceProperties.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/FindReplaceProperties.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/FindReplaceProperties.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/FindReplaceProperties.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthInputMap.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthInputMap.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthInputMap.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthInputMap.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxDocument.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxDocument.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxDocument.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxDocument.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextAreaUI.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextAreaUI.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextAreaUI.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextAreaUI.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/MirthRTextScrollPane.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRTextScrollPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/MirthRTextScrollPane.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/MirthRTextScrollPane.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/RSTAPreferences.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/RSTAPreferences.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/RSTAPreferences.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/RSTAPreferences.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletionCacheInterface.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletionCacheInterface.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletionCacheInterface.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthCompletionCacheInterface.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthFunctionCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthFunctionCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthFunctionCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthFunctionCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthLanguageSupport.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthLanguageSupport.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/MirthLanguageSupport.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/MirthLanguageSupport.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptBasicCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptBasicCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptBasicCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptBasicCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCellRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCellRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCellRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCellRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptClassCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptClassCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptClassCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptClassCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCodeCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCodeCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCodeCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCodeCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCompletionProvider.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCompletionProvider.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCompletionProvider.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptCompletionProvider.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptFunctionCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptFunctionCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptFunctionCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptFunctionCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptLanguageSupport.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptLanguageSupport.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptLanguageSupport.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptLanguageSupport.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptShorthandCompletionCache.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptShorthandCompletionCache.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptShorthandCompletionCache.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptShorthandCompletionCache.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptTemplateCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptTemplateCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptTemplateCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthJavaScriptTemplateCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthSourceCompletionProvider.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthSourceCompletionProvider.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/MirthSourceCompletionProvider.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/MirthSourceCompletionProvider.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/ac/js/PartialHashMap.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/PartialHashMap.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/ac/js/PartialHashMap.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/ac/js/PartialHashMap.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ActionInfo.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ActionInfo.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ActionInfo.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ActionInfo.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/BeginMacroAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/BeginMacroAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/BeginMacroAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/BeginMacroAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ClearMarkedOccurrencesAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ClearMarkedOccurrencesAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ClearMarkedOccurrencesAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ClearMarkedOccurrencesAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllCommentFoldsAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllCommentFoldsAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllCommentFoldsAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllCommentFoldsAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllFoldsAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllFoldsAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllFoldsAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseAllFoldsAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseFoldAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseFoldAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/CollapseFoldAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CollapseFoldAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/CopyAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CopyAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/CopyAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CopyAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/CutAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CutAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/CutAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/CutAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteLineAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteLineAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteLineAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteLineAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteRestOfLineAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteRestOfLineAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/DeleteRestOfLineAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DeleteRestOfLineAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/DocumentEndAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DocumentEndAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/DocumentEndAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DocumentEndAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/DocumentStartAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DocumentStartAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/DocumentStartAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/DocumentStartAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/EndMacroAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/EndMacroAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/EndMacroAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/EndMacroAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ExpandAllFoldsAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ExpandAllFoldsAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ExpandAllFoldsAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ExpandAllFoldsAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ExpandFoldAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ExpandFoldAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ExpandFoldAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ExpandFoldAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/FindNextAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FindNextAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/FindNextAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FindNextAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/FindReplaceAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FindReplaceAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/FindReplaceAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FindReplaceAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/GoToMatchingBracketAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/GoToMatchingBracketAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/GoToMatchingBracketAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/GoToMatchingBracketAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/HorizontalPageAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/HorizontalPageAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/HorizontalPageAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/HorizontalPageAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/InsertBreakAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/InsertBreakAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/InsertBreakAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/InsertBreakAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/JoinLineAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/JoinLineAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/JoinLineAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/JoinLineAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/LineEndAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/LineEndAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/LineEndAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/LineEndAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/LineStartAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/LineStartAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/LineStartAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/LineStartAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MirthRecordableTextAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MirthRecordableTextAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MirthRecordableTextAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MirthRecordableTextAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveDownAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveDownAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveDownAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveDownAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftWordAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftWordAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftWordAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLeftWordAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLineAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLineAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveLineAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveLineAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveRightAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveRightAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveRightAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveRightAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveRightWordAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveRightWordAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveRightWordAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveRightWordAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveUpAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveUpAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/MoveUpAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/MoveUpAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/PageDownAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PageDownAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/PageDownAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PageDownAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/PageUpAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PageUpAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/PageUpAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PageUpAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/PasteAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PasteAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/PasteAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PasteAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/PlaybackMacroAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PlaybackMacroAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/PlaybackMacroAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/PlaybackMacroAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/RedoAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/RedoAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/RedoAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/RedoAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ScrollAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ScrollAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ScrollAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ScrollAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/SelectAllAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/SelectAllAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/SelectAllAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/SelectAllAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowLineEndingsAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowLineEndingsAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowLineEndingsAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowLineEndingsAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowTabLinesAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowTabLinesAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowTabLinesAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowTabLinesAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowWhitespaceAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowWhitespaceAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ShowWhitespaceAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ShowWhitespaceAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ToggleCommentAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ToggleCommentAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ToggleCommentAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ToggleCommentAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/UndoAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/UndoAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/UndoAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/UndoAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/ViewUserAPIAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ViewUserAPIAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/ViewUserAPIAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/ViewUserAPIAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/actions/WrapLinesAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/WrapLinesAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/WrapLinesAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/WrapLinesAction.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/token/MirthTokenMakerFactory.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/token/MirthTokenMakerFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/token/MirthTokenMakerFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/token/MirthTokenMakerFactory.java diff --git a/client/src/com/mirth/connect/client/ui/components/rsta/token/js/MirthJavaScriptTokenMaker.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/token/js/MirthJavaScriptTokenMaker.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/token/js/MirthJavaScriptTokenMaker.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/token/js/MirthJavaScriptTokenMaker.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionDelegate.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionDelegate.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionDelegate.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionDelegate.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionPopupWindow.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionPopupWindow.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionPopupWindow.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionPopupWindow.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionProvider.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionProvider.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/AutoCompletionProvider.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/AutoCompletionProvider.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/ChannelNameFilterCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/ChannelNameFilterCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/ChannelNameFilterCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/ChannelNameFilterCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/FilterCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/FilterCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/FilterCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/FilterCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/MirthTagField.html b/client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagField.html similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/MirthTagField.html rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagField.html diff --git a/client/src/com/mirth/connect/client/ui/components/tag/MirthTagField.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagField.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/MirthTagField.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagField.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/MirthTagWebBrowser.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagWebBrowser.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/MirthTagWebBrowser.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagWebBrowser.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/MirthTagWebController.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagWebController.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/MirthTagWebController.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/MirthTagWebController.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/SearchFilterListener.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/SearchFilterListener.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/SearchFilterListener.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/SearchFilterListener.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/TagCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/TagCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/TagCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/TagCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/TagCompletionRenderer.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/TagCompletionRenderer.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/TagCompletionRenderer.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/TagCompletionRenderer.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/TagFilterCompletion.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/TagFilterCompletion.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/TagFilterCompletion.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/TagFilterCompletion.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/TagLabel.java b/client/src/main/java/com/mirth/connect/client/ui/components/tag/TagLabel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/TagLabel.java rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/TagLabel.java diff --git a/client/src/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.css b/client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.css similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.css rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.css diff --git a/client/src/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.js b/client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.js similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.js rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.js diff --git a/client/src/com/mirth/connect/client/ui/components/tag/bootstrap.min.css b/client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap.min.css similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/bootstrap.min.css rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/bootstrap.min.css diff --git a/client/src/com/mirth/connect/client/ui/components/tag/jquery-ui.min.js b/client/src/main/java/com/mirth/connect/client/ui/components/tag/jquery-ui.min.js similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/jquery-ui.min.js rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/jquery-ui.min.js diff --git a/client/src/com/mirth/connect/client/ui/components/tag/jquery.min.js b/client/src/main/java/com/mirth/connect/client/ui/components/tag/jquery.min.js similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/jquery.min.js rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/jquery.min.js diff --git a/client/src/com/mirth/connect/client/ui/components/tag/tokenfield-typeahead.css b/client/src/main/java/com/mirth/connect/client/ui/components/tag/tokenfield-typeahead.css similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/tag/tokenfield-typeahead.css rename to client/src/main/java/com/mirth/connect/client/ui/components/tag/tokenfield-typeahead.css diff --git a/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesPanel.java b/client/src/main/java/com/mirth/connect/client/ui/dependencies/ChannelDependenciesPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/dependencies/ChannelDependenciesPanel.java diff --git a/client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java b/client/src/main/java/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/dependencies/ChannelDependenciesWarningDialog.java diff --git a/client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java b/client/src/main/java/com/mirth/connect/client/ui/editors/BaseEditorPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/BaseEditorPane.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/BaseEditorPane.java diff --git a/client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.form b/client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.form diff --git a/client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.java b/client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsDialog.java diff --git a/client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.form b/client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.form diff --git a/client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/BasicModeSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.form b/client/src/main/java/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.form diff --git a/client/src/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.java b/client/src/main/java/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/DataTypePropertiesDialog.java diff --git a/client/src/com/mirth/connect/client/ui/editors/EditorConstants.java b/client/src/main/java/com/mirth/connect/client/ui/editors/EditorConstants.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/EditorConstants.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/EditorConstants.java diff --git a/client/src/com/mirth/connect/client/ui/editors/EditorPanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/EditorPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/EditorPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/EditorPanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/FilterTransformerTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/editors/FilterTransformerTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/FilterTransformerTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/FilterTransformerTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/editors/FilterTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/editors/FilterTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/FilterTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/FilterTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.form b/client/src/main/java/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.form diff --git a/client/src/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/FrameModeSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/IteratorPanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/IteratorPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/IteratorPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/IteratorPanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/IteratorUtil.java b/client/src/main/java/com/mirth/connect/client/ui/editors/IteratorUtil.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/IteratorUtil.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/IteratorUtil.java diff --git a/client/src/com/mirth/connect/client/ui/editors/IteratorWizardDialog.java b/client/src/main/java/com/mirth/connect/client/ui/editors/IteratorWizardDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/IteratorWizardDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/IteratorWizardDialog.java diff --git a/client/src/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.form b/client/src/main/java/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.form diff --git a/client/src/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.java b/client/src/main/java/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/JavaScriptEditorDialog.java diff --git a/client/src/com/mirth/connect/client/ui/editors/LineNumber.java b/client/src/main/java/com/mirth/connect/client/ui/editors/LineNumber.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/LineNumber.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/LineNumber.java diff --git a/client/src/com/mirth/connect/client/ui/editors/MessageTemplatePanel.form b/client/src/main/java/com/mirth/connect/client/ui/editors/MessageTemplatePanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/MessageTemplatePanel.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/MessageTemplatePanel.form diff --git a/client/src/com/mirth/connect/client/ui/editors/MessageTemplatePanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/MessageTemplatePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/MessageTemplatePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/MessageTemplatePanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/MessageTreePanel.form b/client/src/main/java/com/mirth/connect/client/ui/editors/MessageTreePanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/MessageTreePanel.form rename to client/src/main/java/com/mirth/connect/client/ui/editors/MessageTreePanel.form diff --git a/client/src/com/mirth/connect/client/ui/editors/MessageTreePanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/MessageTreePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/MessageTreePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/MessageTreePanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/TabbedTemplatePanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/TabbedTemplatePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/TabbedTemplatePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/TabbedTemplatePanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/TransformerTreeTableNode.java b/client/src/main/java/com/mirth/connect/client/ui/editors/TransformerTreeTableNode.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/TransformerTreeTableNode.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/TransformerTreeTableNode.java diff --git a/client/src/com/mirth/connect/client/ui/editors/filter/FilterPane.java b/client/src/main/java/com/mirth/connect/client/ui/editors/filter/FilterPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/filter/FilterPane.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/filter/FilterPane.java diff --git a/client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/filter/IteratorRulePanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/transformer/IteratorStepPanel.java b/client/src/main/java/com/mirth/connect/client/ui/editors/transformer/IteratorStepPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/transformer/IteratorStepPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/transformer/IteratorStepPanel.java diff --git a/client/src/com/mirth/connect/client/ui/editors/transformer/TransformerPane.java b/client/src/main/java/com/mirth/connect/client/ui/editors/transformer/TransformerPane.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/editors/transformer/TransformerPane.java rename to client/src/main/java/com/mirth/connect/client/ui/editors/transformer/TransformerPane.java diff --git a/client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.form b/client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.form rename to client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.form diff --git a/client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.java b/client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionInfoDialog.java diff --git a/client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.form b/client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.form diff --git a/client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.java b/client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionManagerPanel.java diff --git a/client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionUtil.java b/client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionUtil.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/extensionmanager/ExtensionUtil.java rename to client/src/main/java/com/mirth/connect/client/ui/extensionmanager/ExtensionUtil.java diff --git a/client/src/com/mirth/connect/client/ui/images/MirthConnect_Logo_WM_White.png b/client/src/main/java/com/mirth/connect/client/ui/images/MirthConnect_Logo_WM_White.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/MirthConnect_Logo_WM_White.png rename to client/src/main/java/com/mirth/connect/client/ui/images/MirthConnect_Logo_WM_White.png diff --git a/client/src/com/mirth/connect/client/ui/images/MirthConnect_NLogo_RGB.png b/client/src/main/java/com/mirth/connect/client/ui/images/MirthConnect_NLogo_RGB.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/MirthConnect_NLogo_RGB.png rename to client/src/main/java/com/mirth/connect/client/ui/images/MirthConnect_NLogo_RGB.png diff --git a/client/src/com/mirth/connect/client/ui/images/NG_MC_Icon_32x32.png b/client/src/main/java/com/mirth/connect/client/ui/images/NG_MC_Icon_32x32.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/NG_MC_Icon_32x32.png rename to client/src/main/java/com/mirth/connect/client/ui/images/NG_MC_Icon_32x32.png diff --git a/client/src/com/mirth/connect/client/ui/images/accept.png b/client/src/main/java/com/mirth/connect/client/ui/images/accept.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/accept.png rename to client/src/main/java/com/mirth/connect/client/ui/images/accept.png diff --git a/client/src/com/mirth/connect/client/ui/images/add.png b/client/src/main/java/com/mirth/connect/client/ui/images/add.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/add.png rename to client/src/main/java/com/mirth/connect/client/ui/images/add.png diff --git a/client/src/com/mirth/connect/client/ui/images/and.png b/client/src/main/java/com/mirth/connect/client/ui/images/and.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/and.png rename to client/src/main/java/com/mirth/connect/client/ui/images/and.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_form.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_form.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_form.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_form.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_form_add.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_form_add.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_form_add.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_form_add.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_form_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_form_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_form_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_form_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_form_edit.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_form_edit.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_form_edit.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_form_edit.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_view_detail.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_view_detail.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_view_detail.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_view_detail.png diff --git a/client/src/com/mirth/connect/client/ui/images/application_view_list.png b/client/src/main/java/com/mirth/connect/client/ui/images/application_view_list.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/application_view_list.png rename to client/src/main/java/com/mirth/connect/client/ui/images/application_view_list.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_down.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_down.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_down.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_down.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_redo.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_redo.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_redo.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_redo.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_refresh.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_refresh.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_refresh.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_refresh.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_rotate_clockwise.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_rotate_clockwise.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_rotate_clockwise.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_rotate_clockwise.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_undo.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_undo.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_undo.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_undo.png diff --git a/client/src/com/mirth/connect/client/ui/images/arrow_up.png b/client/src/main/java/com/mirth/connect/client/ui/images/arrow_up.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/arrow_up.png rename to client/src/main/java/com/mirth/connect/client/ui/images/arrow_up.png diff --git a/client/src/com/mirth/connect/client/ui/images/attach.png b/client/src/main/java/com/mirth/connect/client/ui/images/attach.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/attach.png rename to client/src/main/java/com/mirth/connect/client/ui/images/attach.png diff --git a/client/src/com/mirth/connect/client/ui/images/book_next.png b/client/src/main/java/com/mirth/connect/client/ui/images/book_next.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/book_next.png rename to client/src/main/java/com/mirth/connect/client/ui/images/book_next.png diff --git a/client/src/com/mirth/connect/client/ui/images/book_previous.png b/client/src/main/java/com/mirth/connect/client/ui/images/book_previous.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/book_previous.png rename to client/src/main/java/com/mirth/connect/client/ui/images/book_previous.png diff --git a/client/src/com/mirth/connect/client/ui/images/bug.png b/client/src/main/java/com/mirth/connect/client/ui/images/bug.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bug.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bug.png diff --git a/client/src/com/mirth/connect/client/ui/images/bug_go.png b/client/src/main/java/com/mirth/connect/client/ui/images/bug_go.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bug_go.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bug_go.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_black.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_black.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_black.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_black.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_blue.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_blue.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_blue.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_blue.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_green.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_green.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_green.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_green.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_orange.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_orange.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_orange.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_orange.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_red.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_red.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_red.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_red.png diff --git a/client/src/com/mirth/connect/client/ui/images/bullet_yellow.png b/client/src/main/java/com/mirth/connect/client/ui/images/bullet_yellow.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/bullet_yellow.png rename to client/src/main/java/com/mirth/connect/client/ui/images/bullet_yellow.png diff --git a/client/src/com/mirth/connect/client/ui/images/calendar_view_month.png b/client/src/main/java/com/mirth/connect/client/ui/images/calendar_view_month.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/calendar_view_month.png rename to client/src/main/java/com/mirth/connect/client/ui/images/calendar_view_month.png diff --git a/client/src/com/mirth/connect/client/ui/images/chart_bar_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/chart_bar_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/chart_bar_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/chart_bar_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/connect.png b/client/src/main/java/com/mirth/connect/client/ui/images/connect.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/connect.png rename to client/src/main/java/com/mirth/connect/client/ui/images/connect.png diff --git a/client/src/com/mirth/connect/client/ui/images/control_pause_blue.png b/client/src/main/java/com/mirth/connect/client/ui/images/control_pause_blue.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/control_pause_blue.png rename to client/src/main/java/com/mirth/connect/client/ui/images/control_pause_blue.png diff --git a/client/src/com/mirth/connect/client/ui/images/control_play_blue.png b/client/src/main/java/com/mirth/connect/client/ui/images/control_play_blue.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/control_play_blue.png rename to client/src/main/java/com/mirth/connect/client/ui/images/control_play_blue.png diff --git a/client/src/com/mirth/connect/client/ui/images/control_stop_blue.png b/client/src/main/java/com/mirth/connect/client/ui/images/control_stop_blue.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/control_stop_blue.png rename to client/src/main/java/com/mirth/connect/client/ui/images/control_stop_blue.png diff --git a/client/src/com/mirth/connect/client/ui/images/cross.png b/client/src/main/java/com/mirth/connect/client/ui/images/cross.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/cross.png rename to client/src/main/java/com/mirth/connect/client/ui/images/cross.png diff --git a/client/src/com/mirth/connect/client/ui/images/delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/disconnect.png b/client/src/main/java/com/mirth/connect/client/ui/images/disconnect.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/disconnect.png rename to client/src/main/java/com/mirth/connect/client/ui/images/disconnect.png diff --git a/client/src/com/mirth/connect/client/ui/images/disk.png b/client/src/main/java/com/mirth/connect/client/ui/images/disk.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/disk.png rename to client/src/main/java/com/mirth/connect/client/ui/images/disk.png diff --git a/client/src/com/mirth/connect/client/ui/images/email_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/email_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/email_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/email_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/email_go.png b/client/src/main/java/com/mirth/connect/client/ui/images/email_go.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/email_go.png rename to client/src/main/java/com/mirth/connect/client/ui/images/email_go.png diff --git a/client/src/com/mirth/connect/client/ui/images/error.png b/client/src/main/java/com/mirth/connect/client/ui/images/error.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/error.png rename to client/src/main/java/com/mirth/connect/client/ui/images/error.png diff --git a/client/src/com/mirth/connect/client/ui/images/error_add.png b/client/src/main/java/com/mirth/connect/client/ui/images/error_add.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/error_add.png rename to client/src/main/java/com/mirth/connect/client/ui/images/error_add.png diff --git a/client/src/com/mirth/connect/client/ui/images/error_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/error_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/error_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/error_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/exclamation.png b/client/src/main/java/com/mirth/connect/client/ui/images/exclamation.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/exclamation.png rename to client/src/main/java/com/mirth/connect/client/ui/images/exclamation.png diff --git a/client/src/com/mirth/connect/client/ui/images/flag_orange.png b/client/src/main/java/com/mirth/connect/client/ui/images/flag_orange.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/flag_orange.png rename to client/src/main/java/com/mirth/connect/client/ui/images/flag_orange.png diff --git a/client/src/com/mirth/connect/client/ui/images/folder_explore.png b/client/src/main/java/com/mirth/connect/client/ui/images/folder_explore.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/folder_explore.png rename to client/src/main/java/com/mirth/connect/client/ui/images/folder_explore.png diff --git a/client/src/com/mirth/connect/client/ui/images/group.png b/client/src/main/java/com/mirth/connect/client/ui/images/group.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/group.png rename to client/src/main/java/com/mirth/connect/client/ui/images/group.png diff --git a/client/src/com/mirth/connect/client/ui/images/header_nologo.png b/client/src/main/java/com/mirth/connect/client/ui/images/header_nologo.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/header_nologo.png rename to client/src/main/java/com/mirth/connect/client/ui/images/header_nologo.png diff --git a/client/src/com/mirth/connect/client/ui/images/help.png b/client/src/main/java/com/mirth/connect/client/ui/images/help.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/help.png rename to client/src/main/java/com/mirth/connect/client/ui/images/help.png diff --git a/client/src/com/mirth/connect/client/ui/images/house.png b/client/src/main/java/com/mirth/connect/client/ui/images/house.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/house.png rename to client/src/main/java/com/mirth/connect/client/ui/images/house.png diff --git a/client/src/com/mirth/connect/client/ui/images/information.png b/client/src/main/java/com/mirth/connect/client/ui/images/information.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/information.png rename to client/src/main/java/com/mirth/connect/client/ui/images/information.png diff --git a/client/src/com/mirth/connect/client/ui/images/lock_x.png b/client/src/main/java/com/mirth/connect/client/ui/images/lock_x.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/lock_x.png rename to client/src/main/java/com/mirth/connect/client/ui/images/lock_x.png diff --git a/client/src/com/mirth/connect/client/ui/images/or.png b/client/src/main/java/com/mirth/connect/client/ui/images/or.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/or.png rename to client/src/main/java/com/mirth/connect/client/ui/images/or.png diff --git a/client/src/com/mirth/connect/client/ui/images/page_copy.png b/client/src/main/java/com/mirth/connect/client/ui/images/page_copy.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/page_copy.png rename to client/src/main/java/com/mirth/connect/client/ui/images/page_copy.png diff --git a/client/src/com/mirth/connect/client/ui/images/page_edit.png b/client/src/main/java/com/mirth/connect/client/ui/images/page_edit.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/page_edit.png rename to client/src/main/java/com/mirth/connect/client/ui/images/page_edit.png diff --git a/client/src/com/mirth/connect/client/ui/images/page_white_stack.png b/client/src/main/java/com/mirth/connect/client/ui/images/page_white_stack.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/page_white_stack.png rename to client/src/main/java/com/mirth/connect/client/ui/images/page_white_stack.png diff --git a/client/src/com/mirth/connect/client/ui/images/page_white_text.png b/client/src/main/java/com/mirth/connect/client/ui/images/page_white_text.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/page_white_text.png rename to client/src/main/java/com/mirth/connect/client/ui/images/page_white_text.png diff --git a/client/src/com/mirth/connect/client/ui/images/plugin.png b/client/src/main/java/com/mirth/connect/client/ui/images/plugin.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/plugin.png rename to client/src/main/java/com/mirth/connect/client/ui/images/plugin.png diff --git a/client/src/com/mirth/connect/client/ui/images/plugin_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/plugin_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/plugin_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/plugin_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/report_disk.png b/client/src/main/java/com/mirth/connect/client/ui/images/report_disk.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/report_disk.png rename to client/src/main/java/com/mirth/connect/client/ui/images/report_disk.png diff --git a/client/src/com/mirth/connect/client/ui/images/report_go.png b/client/src/main/java/com/mirth/connect/client/ui/images/report_go.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/report_go.png rename to client/src/main/java/com/mirth/connect/client/ui/images/report_go.png diff --git a/client/src/com/mirth/connect/client/ui/images/reprocess_message.png b/client/src/main/java/com/mirth/connect/client/ui/images/reprocess_message.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/reprocess_message.png rename to client/src/main/java/com/mirth/connect/client/ui/images/reprocess_message.png diff --git a/client/src/com/mirth/connect/client/ui/images/reprocess_results.png b/client/src/main/java/com/mirth/connect/client/ui/images/reprocess_results.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/reprocess_results.png rename to client/src/main/java/com/mirth/connect/client/ui/images/reprocess_results.png diff --git a/client/src/com/mirth/connect/client/ui/images/resultset_previous.png b/client/src/main/java/com/mirth/connect/client/ui/images/resultset_previous.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/resultset_previous.png rename to client/src/main/java/com/mirth/connect/client/ui/images/resultset_previous.png diff --git a/client/src/com/mirth/connect/client/ui/images/script_edit.png b/client/src/main/java/com/mirth/connect/client/ui/images/script_edit.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/script_edit.png rename to client/src/main/java/com/mirth/connect/client/ui/images/script_edit.png diff --git a/client/src/com/mirth/connect/client/ui/images/server.png b/client/src/main/java/com/mirth/connect/client/ui/images/server.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/server.png rename to client/src/main/java/com/mirth/connect/client/ui/images/server.png diff --git a/client/src/com/mirth/connect/client/ui/images/server_database.png b/client/src/main/java/com/mirth/connect/client/ui/images/server_database.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/server_database.png rename to client/src/main/java/com/mirth/connect/client/ui/images/server_database.png diff --git a/client/src/com/mirth/connect/client/ui/images/sport_8ball.png b/client/src/main/java/com/mirth/connect/client/ui/images/sport_8ball.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/sport_8ball.png rename to client/src/main/java/com/mirth/connect/client/ui/images/sport_8ball.png diff --git a/client/src/com/mirth/connect/client/ui/images/stop.png b/client/src/main/java/com/mirth/connect/client/ui/images/stop.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/stop.png rename to client/src/main/java/com/mirth/connect/client/ui/images/stop.png diff --git a/client/src/com/mirth/connect/client/ui/images/style.png b/client/src/main/java/com/mirth/connect/client/ui/images/style.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/style.png rename to client/src/main/java/com/mirth/connect/client/ui/images/style.png diff --git a/client/src/com/mirth/connect/client/ui/images/table.png b/client/src/main/java/com/mirth/connect/client/ui/images/table.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/table.png rename to client/src/main/java/com/mirth/connect/client/ui/images/table.png diff --git a/client/src/com/mirth/connect/client/ui/images/table_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/table_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/table_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/table_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/table_edit.png b/client/src/main/java/com/mirth/connect/client/ui/images/table_edit.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/table_edit.png rename to client/src/main/java/com/mirth/connect/client/ui/images/table_edit.png diff --git a/client/src/com/mirth/connect/client/ui/images/table_gear.png b/client/src/main/java/com/mirth/connect/client/ui/images/table_gear.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/table_gear.png rename to client/src/main/java/com/mirth/connect/client/ui/images/table_gear.png diff --git a/client/src/com/mirth/connect/client/ui/images/tag_blue.png b/client/src/main/java/com/mirth/connect/client/ui/images/tag_blue.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/tag_blue.png rename to client/src/main/java/com/mirth/connect/client/ui/images/tag_blue.png diff --git a/client/src/com/mirth/connect/client/ui/images/tag_gray.png b/client/src/main/java/com/mirth/connect/client/ui/images/tag_gray.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/tag_gray.png rename to client/src/main/java/com/mirth/connect/client/ui/images/tag_gray.png diff --git a/client/src/com/mirth/connect/client/ui/images/tick.png b/client/src/main/java/com/mirth/connect/client/ui/images/tick.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/tick.png rename to client/src/main/java/com/mirth/connect/client/ui/images/tick.png diff --git a/client/src/com/mirth/connect/client/ui/images/user.png b/client/src/main/java/com/mirth/connect/client/ui/images/user.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/user.png rename to client/src/main/java/com/mirth/connect/client/ui/images/user.png diff --git a/client/src/com/mirth/connect/client/ui/images/user_add.png b/client/src/main/java/com/mirth/connect/client/ui/images/user_add.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/user_add.png rename to client/src/main/java/com/mirth/connect/client/ui/images/user_add.png diff --git a/client/src/com/mirth/connect/client/ui/images/user_delete.png b/client/src/main/java/com/mirth/connect/client/ui/images/user_delete.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/user_delete.png rename to client/src/main/java/com/mirth/connect/client/ui/images/user_delete.png diff --git a/client/src/com/mirth/connect/client/ui/images/user_edit.png b/client/src/main/java/com/mirth/connect/client/ui/images/user_edit.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/user_edit.png rename to client/src/main/java/com/mirth/connect/client/ui/images/user_edit.png diff --git a/client/src/com/mirth/connect/client/ui/images/wizardsidebar.png b/client/src/main/java/com/mirth/connect/client/ui/images/wizardsidebar.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/wizardsidebar.png rename to client/src/main/java/com/mirth/connect/client/ui/images/wizardsidebar.png diff --git a/client/src/com/mirth/connect/client/ui/images/world_go.png b/client/src/main/java/com/mirth/connect/client/ui/images/world_go.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/world_go.png rename to client/src/main/java/com/mirth/connect/client/ui/images/world_go.png diff --git a/client/src/com/mirth/connect/client/ui/images/world_link.png b/client/src/main/java/com/mirth/connect/client/ui/images/world_link.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/world_link.png rename to client/src/main/java/com/mirth/connect/client/ui/images/world_link.png diff --git a/client/src/com/mirth/connect/client/ui/images/wrench.png b/client/src/main/java/com/mirth/connect/client/ui/images/wrench.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/wrench.png rename to client/src/main/java/com/mirth/connect/client/ui/images/wrench.png diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/AdvancedPollingSettingsDialog.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/AdvancedPollingSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/AdvancedPollingSettingsDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/AdvancedPollingSettingsDialog.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ConnectorPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ConnectorPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ConnectorSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/DestinationSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/DestinationSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/DestinationSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/DestinationSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/ListenerSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ListenerSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/ListenerSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ListenerSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/PollingSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/PollingSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/PollingSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/PollingSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/ResponseHandler.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ResponseHandler.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/ResponseHandler.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/ResponseHandler.java diff --git a/client/src/com/mirth/connect/client/ui/panels/connectors/SourceSettingsPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/connectors/SourceSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/connectors/SourceSettingsPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/connectors/SourceSettingsPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/export/ArchiveFormat.java b/client/src/main/java/com/mirth/connect/client/ui/panels/export/ArchiveFormat.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/export/ArchiveFormat.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/export/ArchiveFormat.java diff --git a/client/src/com/mirth/connect/client/ui/panels/export/ExportFormat.java b/client/src/main/java/com/mirth/connect/client/ui/panels/export/ExportFormat.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/export/ExportFormat.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/export/ExportFormat.java diff --git a/client/src/com/mirth/connect/client/ui/panels/export/MessageExportPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/export/MessageExportPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/export/MessageExportPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/export/MessageExportPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListHandler.java b/client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListHandler.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListHandler.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListHandler.java diff --git a/client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.form b/client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.form similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.form rename to client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.form diff --git a/client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.java b/client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceListPanel.java diff --git a/client/src/com/mirth/connect/client/ui/panels/reference/ReferenceTable.java b/client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/reference/ReferenceTable.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/reference/ReferenceTable.java diff --git a/client/src/com/mirth/connect/client/ui/panels/reference/VariableReferenceTable.java b/client/src/main/java/com/mirth/connect/client/ui/panels/reference/VariableReferenceTable.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/panels/reference/VariableReferenceTable.java rename to client/src/main/java/com/mirth/connect/client/ui/panels/reference/VariableReferenceTable.java diff --git a/client/src/com/mirth/connect/client/ui/reference/Category.java b/client/src/main/java/com/mirth/connect/client/ui/reference/Category.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/Category.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/Category.java diff --git a/client/src/com/mirth/connect/client/ui/reference/ClassReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/ClassReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/ClassReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/ClassReference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/ClassVisitor.java b/client/src/main/java/com/mirth/connect/client/ui/reference/ClassVisitor.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/ClassVisitor.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/ClassVisitor.java diff --git a/client/src/com/mirth/connect/client/ui/reference/CodeReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/CodeReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/CodeReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/CodeReference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/ConstructorReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/ConstructorReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/ConstructorReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/ConstructorReference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/FunctionReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/FunctionReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/FunctionReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/FunctionReference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/ParameterizedCodeReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/ParameterizedCodeReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/ParameterizedCodeReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/ParameterizedCodeReference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/Reference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/Reference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/Reference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/Reference.java diff --git a/client/src/com/mirth/connect/client/ui/reference/ReferenceListFactory.java b/client/src/main/java/com/mirth/connect/client/ui/reference/ReferenceListFactory.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/ReferenceListFactory.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/ReferenceListFactory.java diff --git a/client/src/com/mirth/connect/client/ui/reference/VariableReference.java b/client/src/main/java/com/mirth/connect/client/ui/reference/VariableReference.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/reference/VariableReference.java rename to client/src/main/java/com/mirth/connect/client/ui/reference/VariableReference.java diff --git a/client/src/com/mirth/connect/client/ui/tag/ChannelTagLabelCache.java b/client/src/main/java/com/mirth/connect/client/ui/tag/ChannelTagLabelCache.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/tag/ChannelTagLabelCache.java rename to client/src/main/java/com/mirth/connect/client/ui/tag/ChannelTagLabelCache.java diff --git a/client/src/com/mirth/connect/client/ui/tag/SettingsPanelTags.java b/client/src/main/java/com/mirth/connect/client/ui/tag/SettingsPanelTags.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/tag/SettingsPanelTags.java rename to client/src/main/java/com/mirth/connect/client/ui/tag/SettingsPanelTags.java diff --git a/client/src/com/mirth/connect/client/ui/util/DisplayUtil.java b/client/src/main/java/com/mirth/connect/client/ui/util/DisplayUtil.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/util/DisplayUtil.java rename to client/src/main/java/com/mirth/connect/client/ui/util/DisplayUtil.java diff --git a/client/src/com/mirth/connect/client/ui/util/PortUsageDialog.java b/client/src/main/java/com/mirth/connect/client/ui/util/PortUsageDialog.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/util/PortUsageDialog.java rename to client/src/main/java/com/mirth/connect/client/ui/util/PortUsageDialog.java diff --git a/client/src/com/mirth/connect/client/ui/util/SQLParserUtil.java b/client/src/main/java/com/mirth/connect/client/ui/util/SQLParserUtil.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/util/SQLParserUtil.java rename to client/src/main/java/com/mirth/connect/client/ui/util/SQLParserUtil.java diff --git a/client/src/com/mirth/connect/client/ui/util/VariableListUtil.java b/client/src/main/java/com/mirth/connect/client/ui/util/VariableListUtil.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/util/VariableListUtil.java rename to client/src/main/java/com/mirth/connect/client/ui/util/VariableListUtil.java diff --git a/client/src/com/mirth/connect/connectors/dimse/DICOMListener.form b/client/src/main/java/com/mirth/connect/connectors/dimse/DICOMListener.form similarity index 100% rename from client/src/com/mirth/connect/connectors/dimse/DICOMListener.form rename to client/src/main/java/com/mirth/connect/connectors/dimse/DICOMListener.form diff --git a/client/src/com/mirth/connect/connectors/dimse/DICOMListener.java b/client/src/main/java/com/mirth/connect/connectors/dimse/DICOMListener.java similarity index 100% rename from client/src/com/mirth/connect/connectors/dimse/DICOMListener.java rename to client/src/main/java/com/mirth/connect/connectors/dimse/DICOMListener.java diff --git a/client/src/com/mirth/connect/connectors/dimse/DICOMSender.java b/client/src/main/java/com/mirth/connect/connectors/dimse/DICOMSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/dimse/DICOMSender.java rename to client/src/main/java/com/mirth/connect/connectors/dimse/DICOMSender.java diff --git a/client/src/com/mirth/connect/connectors/doc/DocumentWriter.java b/client/src/main/java/com/mirth/connect/connectors/doc/DocumentWriter.java similarity index 100% rename from client/src/com/mirth/connect/connectors/doc/DocumentWriter.java rename to client/src/main/java/com/mirth/connect/connectors/doc/DocumentWriter.java diff --git a/client/src/com/mirth/connect/connectors/file/AdvancedFTPSettingsDialog.java b/client/src/main/java/com/mirth/connect/connectors/file/AdvancedFTPSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/AdvancedFTPSettingsDialog.java rename to client/src/main/java/com/mirth/connect/connectors/file/AdvancedFTPSettingsDialog.java diff --git a/client/src/com/mirth/connect/connectors/file/AdvancedS3SettingsDialog.java b/client/src/main/java/com/mirth/connect/connectors/file/AdvancedS3SettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/AdvancedS3SettingsDialog.java rename to client/src/main/java/com/mirth/connect/connectors/file/AdvancedS3SettingsDialog.java diff --git a/client/src/com/mirth/connect/connectors/file/AdvancedSettingsDialog.java b/client/src/main/java/com/mirth/connect/connectors/file/AdvancedSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/AdvancedSettingsDialog.java rename to client/src/main/java/com/mirth/connect/connectors/file/AdvancedSettingsDialog.java diff --git a/client/src/com/mirth/connect/connectors/file/AdvancedSftpSettingsDialog.java b/client/src/main/java/com/mirth/connect/connectors/file/AdvancedSftpSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/AdvancedSftpSettingsDialog.java rename to client/src/main/java/com/mirth/connect/connectors/file/AdvancedSftpSettingsDialog.java diff --git a/client/src/com/mirth/connect/connectors/file/AdvancedSmbSettingsDialog.java b/client/src/main/java/com/mirth/connect/connectors/file/AdvancedSmbSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/AdvancedSmbSettingsDialog.java rename to client/src/main/java/com/mirth/connect/connectors/file/AdvancedSmbSettingsDialog.java diff --git a/client/src/com/mirth/connect/connectors/file/FileReader.java b/client/src/main/java/com/mirth/connect/connectors/file/FileReader.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/FileReader.java rename to client/src/main/java/com/mirth/connect/connectors/file/FileReader.java diff --git a/client/src/com/mirth/connect/connectors/file/FileReaderCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/connectors/file/FileReaderCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/FileReaderCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/connectors/file/FileReaderCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/connectors/file/FileWriter.java b/client/src/main/java/com/mirth/connect/connectors/file/FileWriter.java similarity index 100% rename from client/src/com/mirth/connect/connectors/file/FileWriter.java rename to client/src/main/java/com/mirth/connect/connectors/file/FileWriter.java diff --git a/client/src/com/mirth/connect/connectors/http/HttpListener.java b/client/src/main/java/com/mirth/connect/connectors/http/HttpListener.java similarity index 100% rename from client/src/com/mirth/connect/connectors/http/HttpListener.java rename to client/src/main/java/com/mirth/connect/connectors/http/HttpListener.java diff --git a/client/src/com/mirth/connect/connectors/http/HttpListenerCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/connectors/http/HttpListenerCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/connectors/http/HttpListenerCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/connectors/http/HttpListenerCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/connectors/http/HttpSender.form b/client/src/main/java/com/mirth/connect/connectors/http/HttpSender.form similarity index 100% rename from client/src/com/mirth/connect/connectors/http/HttpSender.form rename to client/src/main/java/com/mirth/connect/connectors/http/HttpSender.form diff --git a/client/src/com/mirth/connect/connectors/http/HttpSender.java b/client/src/main/java/com/mirth/connect/connectors/http/HttpSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/http/HttpSender.java rename to client/src/main/java/com/mirth/connect/connectors/http/HttpSender.java diff --git a/client/src/com/mirth/connect/connectors/http/HttpSenderCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/connectors/http/HttpSenderCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/connectors/http/HttpSenderCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/connectors/http/HttpSenderCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java b/client/src/main/java/com/mirth/connect/connectors/http/SSLWarningPanel.java similarity index 100% rename from client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java rename to client/src/main/java/com/mirth/connect/connectors/http/SSLWarningPanel.java diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.java b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.java rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.java diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseDriversDialog.java b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDriversDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseDriversDialog.java rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDriversDialog.java diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.form b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.form similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.form rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.form diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.java b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.java rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseMetadataDialog.java diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseReader.java b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReader.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseReader.java rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReader.java diff --git a/client/src/com/mirth/connect/connectors/jdbc/DatabaseWriter.java b/client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseWriter.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jdbc/DatabaseWriter.java rename to client/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseWriter.java diff --git a/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.form b/client/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorPanel.form similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.form rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorPanel.form diff --git a/client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java b/client/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorPanel.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsConnectorPanel.java rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorPanel.java diff --git a/client/src/com/mirth/connect/connectors/jms/JmsListener.form b/client/src/main/java/com/mirth/connect/connectors/jms/JmsListener.form similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsListener.form rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsListener.form diff --git a/client/src/com/mirth/connect/connectors/jms/JmsListener.java b/client/src/main/java/com/mirth/connect/connectors/jms/JmsListener.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsListener.java rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsListener.java diff --git a/client/src/com/mirth/connect/connectors/jms/JmsSender.form b/client/src/main/java/com/mirth/connect/connectors/jms/JmsSender.form similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsSender.form rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsSender.form diff --git a/client/src/com/mirth/connect/connectors/jms/JmsSender.java b/client/src/main/java/com/mirth/connect/connectors/jms/JmsSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsSender.java rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsSender.java diff --git a/client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java b/client/src/main/java/com/mirth/connect/connectors/jms/JmsTemplateListModel.java similarity index 100% rename from client/src/com/mirth/connect/connectors/jms/JmsTemplateListModel.java rename to client/src/main/java/com/mirth/connect/connectors/jms/JmsTemplateListModel.java diff --git a/client/src/com/mirth/connect/connectors/js/JavaScriptReader.java b/client/src/main/java/com/mirth/connect/connectors/js/JavaScriptReader.java similarity index 100% rename from client/src/com/mirth/connect/connectors/js/JavaScriptReader.java rename to client/src/main/java/com/mirth/connect/connectors/js/JavaScriptReader.java diff --git a/client/src/com/mirth/connect/connectors/js/JavaScriptWriter.form b/client/src/main/java/com/mirth/connect/connectors/js/JavaScriptWriter.form similarity index 100% rename from client/src/com/mirth/connect/connectors/js/JavaScriptWriter.form rename to client/src/main/java/com/mirth/connect/connectors/js/JavaScriptWriter.form diff --git a/client/src/com/mirth/connect/connectors/js/JavaScriptWriter.java b/client/src/main/java/com/mirth/connect/connectors/js/JavaScriptWriter.java similarity index 100% rename from client/src/com/mirth/connect/connectors/js/JavaScriptWriter.java rename to client/src/main/java/com/mirth/connect/connectors/js/JavaScriptWriter.java diff --git a/client/src/com/mirth/connect/connectors/smtp/SmtpSender.java b/client/src/main/java/com/mirth/connect/connectors/smtp/SmtpSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/smtp/SmtpSender.java rename to client/src/main/java/com/mirth/connect/connectors/smtp/SmtpSender.java diff --git a/client/src/com/mirth/connect/connectors/tcp/TcpClientPlugin.java b/client/src/main/java/com/mirth/connect/connectors/tcp/TcpClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/connectors/tcp/TcpClientPlugin.java rename to client/src/main/java/com/mirth/connect/connectors/tcp/TcpClientPlugin.java diff --git a/client/src/com/mirth/connect/connectors/tcp/TcpListener.java b/client/src/main/java/com/mirth/connect/connectors/tcp/TcpListener.java similarity index 100% rename from client/src/com/mirth/connect/connectors/tcp/TcpListener.java rename to client/src/main/java/com/mirth/connect/connectors/tcp/TcpListener.java diff --git a/client/src/com/mirth/connect/connectors/tcp/TcpSender.form b/client/src/main/java/com/mirth/connect/connectors/tcp/TcpSender.form similarity index 100% rename from client/src/com/mirth/connect/connectors/tcp/TcpSender.form rename to client/src/main/java/com/mirth/connect/connectors/tcp/TcpSender.form diff --git a/client/src/com/mirth/connect/connectors/tcp/TcpSender.java b/client/src/main/java/com/mirth/connect/connectors/tcp/TcpSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/tcp/TcpSender.java rename to client/src/main/java/com/mirth/connect/connectors/tcp/TcpSender.java diff --git a/client/src/com/mirth/connect/connectors/vm/ChannelReader.form b/client/src/main/java/com/mirth/connect/connectors/vm/ChannelReader.form similarity index 100% rename from client/src/com/mirth/connect/connectors/vm/ChannelReader.form rename to client/src/main/java/com/mirth/connect/connectors/vm/ChannelReader.form diff --git a/client/src/com/mirth/connect/connectors/vm/ChannelReader.java b/client/src/main/java/com/mirth/connect/connectors/vm/ChannelReader.java similarity index 100% rename from client/src/com/mirth/connect/connectors/vm/ChannelReader.java rename to client/src/main/java/com/mirth/connect/connectors/vm/ChannelReader.java diff --git a/client/src/com/mirth/connect/connectors/vm/ChannelWriter.form b/client/src/main/java/com/mirth/connect/connectors/vm/ChannelWriter.form similarity index 100% rename from client/src/com/mirth/connect/connectors/vm/ChannelWriter.form rename to client/src/main/java/com/mirth/connect/connectors/vm/ChannelWriter.form diff --git a/client/src/com/mirth/connect/connectors/vm/ChannelWriter.java b/client/src/main/java/com/mirth/connect/connectors/vm/ChannelWriter.java similarity index 100% rename from client/src/com/mirth/connect/connectors/vm/ChannelWriter.java rename to client/src/main/java/com/mirth/connect/connectors/vm/ChannelWriter.java diff --git a/client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java b/client/src/main/java/com/mirth/connect/connectors/ws/SSLWarningPanel.java similarity index 100% rename from client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java rename to client/src/main/java/com/mirth/connect/connectors/ws/SSLWarningPanel.java diff --git a/client/src/com/mirth/connect/connectors/ws/WebServiceListener.form b/client/src/main/java/com/mirth/connect/connectors/ws/WebServiceListener.form similarity index 100% rename from client/src/com/mirth/connect/connectors/ws/WebServiceListener.form rename to client/src/main/java/com/mirth/connect/connectors/ws/WebServiceListener.form diff --git a/client/src/com/mirth/connect/connectors/ws/WebServiceListener.java b/client/src/main/java/com/mirth/connect/connectors/ws/WebServiceListener.java similarity index 100% rename from client/src/com/mirth/connect/connectors/ws/WebServiceListener.java rename to client/src/main/java/com/mirth/connect/connectors/ws/WebServiceListener.java diff --git a/client/src/com/mirth/connect/connectors/ws/WebServiceSender.java b/client/src/main/java/com/mirth/connect/connectors/ws/WebServiceSender.java similarity index 100% rename from client/src/com/mirth/connect/connectors/ws/WebServiceSender.java rename to client/src/main/java/com/mirth/connect/connectors/ws/WebServiceSender.java diff --git a/client/src/com/mirth/connect/plugins/AttachmentViewer.java b/client/src/main/java/com/mirth/connect/plugins/AttachmentViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/AttachmentViewer.java rename to client/src/main/java/com/mirth/connect/plugins/AttachmentViewer.java diff --git a/client/src/com/mirth/connect/plugins/BasicModeClientProvider.java b/client/src/main/java/com/mirth/connect/plugins/BasicModeClientProvider.java similarity index 100% rename from client/src/com/mirth/connect/plugins/BasicModeClientProvider.java rename to client/src/main/java/com/mirth/connect/plugins/BasicModeClientProvider.java diff --git a/client/src/com/mirth/connect/plugins/ChannelColumnPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ChannelColumnPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ChannelColumnPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ChannelColumnPlugin.java diff --git a/client/src/com/mirth/connect/plugins/ChannelPanelPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ChannelPanelPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ChannelPanelPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ChannelPanelPlugin.java diff --git a/client/src/com/mirth/connect/plugins/ChannelTabPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ChannelTabPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ChannelTabPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ChannelTabPlugin.java diff --git a/client/src/com/mirth/connect/plugins/ChannelWizardPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ChannelWizardPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ChannelWizardPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ChannelWizardPlugin.java diff --git a/client/src/com/mirth/connect/plugins/ClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/CodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/CodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/CodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/CodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/CodeTemplateTypePlugin.java b/client/src/main/java/com/mirth/connect/plugins/CodeTemplateTypePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/CodeTemplateTypePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/CodeTemplateTypePlugin.java diff --git a/client/src/com/mirth/connect/plugins/ConnectorPropertiesPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ConnectorPropertiesPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ConnectorPropertiesPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ConnectorPropertiesPlugin.java diff --git a/client/src/com/mirth/connect/plugins/DashboardColumnPlugin.java b/client/src/main/java/com/mirth/connect/plugins/DashboardColumnPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DashboardColumnPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DashboardColumnPlugin.java diff --git a/client/src/com/mirth/connect/plugins/DashboardPanelPlugin.java b/client/src/main/java/com/mirth/connect/plugins/DashboardPanelPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DashboardPanelPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DashboardPanelPlugin.java diff --git a/client/src/com/mirth/connect/plugins/DashboardTabPlugin.java b/client/src/main/java/com/mirth/connect/plugins/DashboardTabPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DashboardTabPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DashboardTabPlugin.java diff --git a/client/src/com/mirth/connect/plugins/DashboardTablePlugin.java b/client/src/main/java/com/mirth/connect/plugins/DashboardTablePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DashboardTablePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DashboardTablePlugin.java diff --git a/client/src/com/mirth/connect/plugins/DataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/DataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/DataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/DataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/DataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/DataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/FilterRulePlugin.java b/client/src/main/java/com/mirth/connect/plugins/FilterRulePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/FilterRulePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/FilterRulePlugin.java diff --git a/client/src/com/mirth/connect/plugins/FilterTransformerTypePlugin.java b/client/src/main/java/com/mirth/connect/plugins/FilterTransformerTypePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/FilterTransformerTypePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/FilterTransformerTypePlugin.java diff --git a/client/src/com/mirth/connect/plugins/FrameTransmissionModeClientProvider.java b/client/src/main/java/com/mirth/connect/plugins/FrameTransmissionModeClientProvider.java similarity index 100% rename from client/src/com/mirth/connect/plugins/FrameTransmissionModeClientProvider.java rename to client/src/main/java/com/mirth/connect/plugins/FrameTransmissionModeClientProvider.java diff --git a/client/src/com/mirth/connect/plugins/IteratorRulePlugin.java b/client/src/main/java/com/mirth/connect/plugins/IteratorRulePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/IteratorRulePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/IteratorRulePlugin.java diff --git a/client/src/com/mirth/connect/plugins/IteratorStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/IteratorStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/IteratorStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/IteratorStepPlugin.java diff --git a/client/src/com/mirth/connect/plugins/LibraryClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/LibraryClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/LibraryClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/LibraryClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/MultiFactorAuthenticationClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/MultiFactorAuthenticationClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/MultiFactorAuthenticationClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/MultiFactorAuthenticationClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/ResourceClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/ResourceClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/ResourceClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/ResourceClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/SettingsPanelPlugin.java b/client/src/main/java/com/mirth/connect/plugins/SettingsPanelPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/SettingsPanelPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/SettingsPanelPlugin.java diff --git a/client/src/com/mirth/connect/plugins/TaskPlugin.java b/client/src/main/java/com/mirth/connect/plugins/TaskPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/TaskPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/TaskPlugin.java diff --git a/client/src/com/mirth/connect/plugins/TransformerStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/TransformerStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/TransformerStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/TransformerStepPlugin.java diff --git a/client/src/com/mirth/connect/plugins/TransmissionModeClientProvider.java b/client/src/main/java/com/mirth/connect/plugins/TransmissionModeClientProvider.java similarity index 100% rename from client/src/com/mirth/connect/plugins/TransmissionModeClientProvider.java rename to client/src/main/java/com/mirth/connect/plugins/TransmissionModeClientProvider.java diff --git a/client/src/com/mirth/connect/plugins/TransmissionModePlugin.java b/client/src/main/java/com/mirth/connect/plugins/TransmissionModePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/TransmissionModePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/TransmissionModePlugin.java diff --git a/client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusClient.java b/client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusClient.java similarity index 100% rename from client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusClient.java rename to client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusClient.java diff --git a/client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusColumn.java b/client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusColumn.java similarity index 100% rename from client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusColumn.java rename to client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusColumn.java diff --git a/client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.form b/client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.form similarity index 100% rename from client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.form rename to client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.form diff --git a/client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.java b/client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.java rename to client/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusPanel.java diff --git a/client/src/com/mirth/connect/plugins/datapruner/DataPrunerClient.java b/client/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerClient.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datapruner/DataPrunerClient.java rename to client/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerClient.java diff --git a/client/src/com/mirth/connect/plugins/datapruner/DataPrunerPanel.java b/client/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datapruner/DataPrunerPanel.java rename to client/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerPanel.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeCodeTemplatePlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeCodeTemplatePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeCodeTemplatePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeCodeTemplatePlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPanel.java b/client/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPanel.java rename to client/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPanel.java diff --git a/client/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPlugin.java b/client/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterPlugin.java diff --git a/client/src/com/mirth/connect/plugins/dicomviewer/DICOMViewer.java b/client/src/main/java/com/mirth/connect/plugins/dicomviewer/DICOMViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/dicomviewer/DICOMViewer.java rename to client/src/main/java/com/mirth/connect/plugins/dicomviewer/DICOMViewer.java diff --git a/client/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceClientPlugin.java b/client/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceClientPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceClientPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceClientPlugin.java diff --git a/client/src/com/mirth/connect/plugins/directoryresource/DirectoryResourcePropertiesPanel.java b/client/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourcePropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/directoryresource/DirectoryResourcePropertiesPanel.java rename to client/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourcePropertiesPanel.java diff --git a/client/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapClient.java b/client/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapClient.java similarity index 100% rename from client/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapClient.java rename to client/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapClient.java diff --git a/client/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapPanel.java b/client/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapPanel.java rename to client/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapPanel.java diff --git a/client/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPanel.java b/client/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPanel.java rename to client/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPanel.java diff --git a/client/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPlugin.java b/client/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPropertiesPlugin.java diff --git a/client/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthDialog.java b/client/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthDialog.java similarity index 100% rename from client/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthDialog.java rename to client/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthDialog.java diff --git a/client/src/com/mirth/connect/plugins/imageviewer/ImageViewer.java b/client/src/main/java/com/mirth/connect/plugins/imageviewer/ImageViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/imageviewer/ImageViewer.java rename to client/src/main/java/com/mirth/connect/plugins/imageviewer/ImageViewer.java diff --git a/client/src/com/mirth/connect/plugins/javascriptrule/JavaScriptPanel.java b/client/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/javascriptrule/JavaScriptPanel.java rename to client/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptPanel.java diff --git a/client/src/com/mirth/connect/plugins/javascriptrule/JavaScriptRulePlugin.java b/client/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptRulePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/javascriptrule/JavaScriptRulePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptRulePlugin.java diff --git a/client/src/com/mirth/connect/plugins/javascriptstep/JavaScriptPanel.java b/client/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/javascriptstep/JavaScriptPanel.java rename to client/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptPanel.java diff --git a/client/src/com/mirth/connect/plugins/javascriptstep/JavaScriptStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/javascriptstep/JavaScriptStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptStepPlugin.java diff --git a/client/src/com/mirth/connect/plugins/mapper/MapperPanel.java b/client/src/main/java/com/mirth/connect/plugins/mapper/MapperPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mapper/MapperPanel.java rename to client/src/main/java/com/mirth/connect/plugins/mapper/MapperPanel.java diff --git a/client/src/com/mirth/connect/plugins/mapper/MapperStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/mapper/MapperStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mapper/MapperStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/mapper/MapperStepPlugin.java diff --git a/client/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderPanel.java b/client/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderPanel.java rename to client/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderPanel.java diff --git a/client/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderPlugin.java b/client/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderPlugin.java diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModeClientProvider.java b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeClientProvider.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModeClientProvider.java rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeClientProvider.java diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModePlugin.java b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModePlugin.java diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.form b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.form similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.form rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.form diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.java b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.java rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsDialog.java diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.form b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.form similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.form rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.form diff --git a/client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.java b/client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.java rename to client/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeSettingsPanel.java diff --git a/client/src/com/mirth/connect/plugins/pdfviewer/MirthPDFViewer.java b/client/src/main/java/com/mirth/connect/plugins/pdfviewer/MirthPDFViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/pdfviewer/MirthPDFViewer.java rename to client/src/main/java/com/mirth/connect/plugins/pdfviewer/MirthPDFViewer.java diff --git a/client/src/com/mirth/connect/plugins/pdfviewer/PDFViewer.java b/client/src/main/java/com/mirth/connect/plugins/pdfviewer/PDFViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/pdfviewer/PDFViewer.java rename to client/src/main/java/com/mirth/connect/plugins/pdfviewer/PDFViewer.java diff --git a/client/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderPanel.java b/client/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderPanel.java rename to client/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderPanel.java diff --git a/client/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderPlugin.java b/client/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderPlugin.java diff --git a/client/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptPanel.java b/client/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptPanel.java rename to client/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptPanel.java diff --git a/client/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRulePlugin.java b/client/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRulePlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRulePlugin.java rename to client/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRulePlugin.java diff --git a/client/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptPanel.java b/client/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptPanel.java rename to client/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptPanel.java diff --git a/client/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStepPlugin.java diff --git a/client/src/com/mirth/connect/plugins/serverlog/ServerLogClient.java b/client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogClient.java similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ServerLogClient.java rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogClient.java diff --git a/client/src/com/mirth/connect/plugins/serverlog/ServerLogPanel.form b/client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogPanel.form similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ServerLogPanel.form rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogPanel.form diff --git a/client/src/com/mirth/connect/plugins/serverlog/ServerLogPanel.java b/client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ServerLogPanel.java rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogPanel.java diff --git a/client/src/com/mirth/connect/plugins/serverlog/ServerLogTextPane.java b/client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogTextPane.java similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ServerLogTextPane.java rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogTextPane.java diff --git a/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.form b/client/src/main/java/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.form similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.form rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.form diff --git a/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java b/client/src/main/java/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java similarity index 100% rename from client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java rename to client/src/main/java/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java diff --git a/client/src/com/mirth/connect/plugins/textviewer/TextViewer.java b/client/src/main/java/com/mirth/connect/plugins/textviewer/TextViewer.java similarity index 100% rename from client/src/com/mirth/connect/plugins/textviewer/TextViewer.java rename to client/src/main/java/com/mirth/connect/plugins/textviewer/TextViewer.java diff --git a/client/src/com/mirth/connect/plugins/xsltstep/XsltStepPanel.java b/client/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStepPanel.java similarity index 100% rename from client/src/com/mirth/connect/plugins/xsltstep/XsltStepPanel.java rename to client/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStepPanel.java diff --git a/client/src/com/mirth/connect/plugins/xsltstep/XsltStepPlugin.java b/client/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStepPlugin.java similarity index 100% rename from client/src/com/mirth/connect/plugins/xsltstep/XsltStepPlugin.java rename to client/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStepPlugin.java diff --git a/client/src/org/fife/rsta/ac/js/JavaScriptParser.java b/client/src/main/java/org/fife/rsta/ac/js/JavaScriptParser.java similarity index 100% rename from client/src/org/fife/rsta/ac/js/JavaScriptParser.java rename to client/src/main/java/org/fife/rsta/ac/js/JavaScriptParser.java diff --git a/client/src/org/fife/ui/autocomplete/AutoCompletePopupWindow.java b/client/src/main/java/org/fife/ui/autocomplete/AutoCompletePopupWindow.java similarity index 100% rename from client/src/org/fife/ui/autocomplete/AutoCompletePopupWindow.java rename to client/src/main/java/org/fife/ui/autocomplete/AutoCompletePopupWindow.java diff --git a/client/src/org/fife/ui/autocomplete/AutoCompletion.java b/client/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java similarity index 100% rename from client/src/org/fife/ui/autocomplete/AutoCompletion.java rename to client/src/main/java/org/fife/ui/autocomplete/AutoCompletion.java diff --git a/client/src/org/fife/ui/rsyntaxtextarea/EOLPreservingRSyntaxDocument.java b/client/src/main/java/org/fife/ui/rsyntaxtextarea/EOLPreservingRSyntaxDocument.java similarity index 100% rename from client/src/org/fife/ui/rsyntaxtextarea/EOLPreservingRSyntaxDocument.java rename to client/src/main/java/org/fife/ui/rsyntaxtextarea/EOLPreservingRSyntaxDocument.java diff --git a/client/src/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java b/client/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java similarity index 100% rename from client/src/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java rename to client/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java diff --git a/client/src/org/fife/ui/rsyntaxtextarea/SyntaxView.java b/client/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxView.java similarity index 100% rename from client/src/org/fife/ui/rsyntaxtextarea/SyntaxView.java rename to client/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxView.java diff --git a/client/src/org/fife/ui/rsyntaxtextarea/SyntaxViewUtil.java b/client/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxViewUtil.java similarity index 100% rename from client/src/org/fife/ui/rsyntaxtextarea/SyntaxViewUtil.java rename to client/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxViewUtil.java diff --git a/client/src/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java b/client/src/main/java/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java similarity index 100% rename from client/src/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java rename to client/src/main/java/org/fife/ui/rsyntaxtextarea/WrappedSyntaxView.java diff --git a/client/src/org/fife/ui/rtextarea/RTATextTransferHandler.java b/client/src/main/java/org/fife/ui/rtextarea/RTATextTransferHandler.java similarity index 100% rename from client/src/org/fife/ui/rtextarea/RTATextTransferHandler.java rename to client/src/main/java/org/fife/ui/rtextarea/RTATextTransferHandler.java diff --git a/client/src/org/fife/ui/rtextarea/RTextArea.java b/client/src/main/java/org/fife/ui/rtextarea/RTextArea.java similarity index 100% rename from client/src/org/fife/ui/rtextarea/RTextArea.java rename to client/src/main/java/org/fife/ui/rtextarea/RTextArea.java diff --git a/client/src/org/fife/ui/rtextarea/RTextAreaBase.java b/client/src/main/java/org/fife/ui/rtextarea/RTextAreaBase.java similarity index 100% rename from client/src/org/fife/ui/rtextarea/RTextAreaBase.java rename to client/src/main/java/org/fife/ui/rtextarea/RTextAreaBase.java diff --git a/client/src/org/fife/ui/rtextarea/SearchEngine.java b/client/src/main/java/org/fife/ui/rtextarea/SearchEngine.java similarity index 100% rename from client/src/org/fife/ui/rtextarea/SearchEngine.java rename to client/src/main/java/org/fife/ui/rtextarea/SearchEngine.java diff --git a/client/src/org/netbeans/api/wizard/displayer/WizardDisplayerImpl.java b/client/src/main/java/org/netbeans/api/wizard/displayer/WizardDisplayerImpl.java similarity index 100% rename from client/src/org/netbeans/api/wizard/displayer/WizardDisplayerImpl.java rename to client/src/main/java/org/netbeans/api/wizard/displayer/WizardDisplayerImpl.java diff --git a/client/src/org/syntax/jedit/DefaultInputHandler.java b/client/src/main/java/org/syntax/jedit/DefaultInputHandler.java similarity index 100% rename from client/src/org/syntax/jedit/DefaultInputHandler.java rename to client/src/main/java/org/syntax/jedit/DefaultInputHandler.java diff --git a/client/src/org/syntax/jedit/InputHandler.java b/client/src/main/java/org/syntax/jedit/InputHandler.java similarity index 100% rename from client/src/org/syntax/jedit/InputHandler.java rename to client/src/main/java/org/syntax/jedit/InputHandler.java diff --git a/client/src/org/syntax/jedit/JEditTextArea.java b/client/src/main/java/org/syntax/jedit/JEditTextArea.java similarity index 100% rename from client/src/org/syntax/jedit/JEditTextArea.java rename to client/src/main/java/org/syntax/jedit/JEditTextArea.java diff --git a/client/src/org/syntax/jedit/KeywordMap.java b/client/src/main/java/org/syntax/jedit/KeywordMap.java similarity index 100% rename from client/src/org/syntax/jedit/KeywordMap.java rename to client/src/main/java/org/syntax/jedit/KeywordMap.java diff --git a/client/src/org/syntax/jedit/MirthPlainDocument.java b/client/src/main/java/org/syntax/jedit/MirthPlainDocument.java similarity index 100% rename from client/src/org/syntax/jedit/MirthPlainDocument.java rename to client/src/main/java/org/syntax/jedit/MirthPlainDocument.java diff --git a/client/src/org/syntax/jedit/SyntaxDocument.java b/client/src/main/java/org/syntax/jedit/SyntaxDocument.java similarity index 100% rename from client/src/org/syntax/jedit/SyntaxDocument.java rename to client/src/main/java/org/syntax/jedit/SyntaxDocument.java diff --git a/client/src/org/syntax/jedit/SyntaxStyle.java b/client/src/main/java/org/syntax/jedit/SyntaxStyle.java similarity index 100% rename from client/src/org/syntax/jedit/SyntaxStyle.java rename to client/src/main/java/org/syntax/jedit/SyntaxStyle.java diff --git a/client/src/org/syntax/jedit/SyntaxUtilities.java b/client/src/main/java/org/syntax/jedit/SyntaxUtilities.java similarity index 100% rename from client/src/org/syntax/jedit/SyntaxUtilities.java rename to client/src/main/java/org/syntax/jedit/SyntaxUtilities.java diff --git a/client/src/org/syntax/jedit/TextAreaDefaults.java b/client/src/main/java/org/syntax/jedit/TextAreaDefaults.java similarity index 100% rename from client/src/org/syntax/jedit/TextAreaDefaults.java rename to client/src/main/java/org/syntax/jedit/TextAreaDefaults.java diff --git a/client/src/org/syntax/jedit/TextAreaPainter.java b/client/src/main/java/org/syntax/jedit/TextAreaPainter.java similarity index 100% rename from client/src/org/syntax/jedit/TextAreaPainter.java rename to client/src/main/java/org/syntax/jedit/TextAreaPainter.java diff --git a/client/src/org/syntax/jedit/TextUtilities.java b/client/src/main/java/org/syntax/jedit/TextUtilities.java similarity index 100% rename from client/src/org/syntax/jedit/TextUtilities.java rename to client/src/main/java/org/syntax/jedit/TextUtilities.java diff --git a/client/src/org/syntax/jedit/tokenmarker/BatchFileTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/BatchFileTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/BatchFileTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/BatchFileTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/CCTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/CCTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/CCTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/CCTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/CTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/CTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/CTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/CTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/EDITokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/EDITokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/EDITokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/EDITokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/EiffelTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/EiffelTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/EiffelTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/EiffelTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/HL7TokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/HL7TokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/HL7TokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/HL7TokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/HTMLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/HTMLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/HTMLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/HTMLTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/IDLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/IDLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/IDLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/IDLTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/JSONTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/JSONTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/JSONTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/JSONTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/JavaScriptTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/JavaScriptTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/JavaScriptTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/JavaScriptTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/JavaTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/JavaTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/JavaTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/JavaTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/MakefileTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/MakefileTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/MakefileTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/MakefileTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/NCPDPTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/NCPDPTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/NCPDPTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/NCPDPTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PHPTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PHPTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PHPTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PHPTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PLSQLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PLSQLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PLSQLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PLSQLTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PatchTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PatchTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PatchTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PatchTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PerlTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PerlTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PerlTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PerlTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PropsTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PropsTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PropsTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PropsTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/PythonTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/PythonTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/PythonTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/PythonTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/SQLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/SQLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/SQLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/SQLTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/ShellScriptTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/ShellScriptTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/ShellScriptTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/ShellScriptTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/TSQLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/TSQLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/TSQLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/TSQLTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/TeXTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/TeXTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/TeXTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/TeXTokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/Token.java b/client/src/main/java/org/syntax/jedit/tokenmarker/Token.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/Token.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/Token.java diff --git a/client/src/org/syntax/jedit/tokenmarker/TokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/TokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/TokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/TokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/X12TokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/X12TokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/X12TokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/X12TokenMarker.java diff --git a/client/src/org/syntax/jedit/tokenmarker/XMLTokenMarker.java b/client/src/main/java/org/syntax/jedit/tokenmarker/XMLTokenMarker.java similarity index 100% rename from client/src/org/syntax/jedit/tokenmarker/XMLTokenMarker.java rename to client/src/main/java/org/syntax/jedit/tokenmarker/XMLTokenMarker.java diff --git a/client/test/com/mirth/connect/client/ui/UserEditPanelTest.java b/client/src/test/com/mirth/connect/client/ui/UserEditPanelTest.java similarity index 100% rename from client/test/com/mirth/connect/client/ui/UserEditPanelTest.java rename to client/src/test/com/mirth/connect/client/ui/UserEditPanelTest.java diff --git a/client/test/com/mirth/connect/client/ui/editors/IteratorUtilTest.java b/client/src/test/com/mirth/connect/client/ui/editors/IteratorUtilTest.java similarity index 100% rename from client/test/com/mirth/connect/client/ui/editors/IteratorUtilTest.java rename to client/src/test/com/mirth/connect/client/ui/editors/IteratorUtilTest.java diff --git a/command/.classpath b/command/.classpath deleted file mode 100644 index e3b787ac0b..0000000000 --- a/command/.classpath +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/command/.project b/command/.project deleted file mode 100644 index e0884d3e51..0000000000 --- a/command/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Command - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/command/build.gradle b/command/build.gradle new file mode 100644 index 0000000000..690d25fff3 --- /dev/null +++ b/command/build.gradle @@ -0,0 +1,110 @@ +plugins { + id 'java' + id 'java-library' + id 'application' + id 'com.gradleup.shadow' version '8.3.6' +} + +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +dependencies { + implementation project(':donkey') + implementation project(':server') + + // Reflections + implementation 'org.reflections:reflections:0.9.10' +} + +// Configure the standard JAR task to build the library part (mirth-cli.jar) +tasks.named('jar', Jar) { + archiveBaseName = 'mirth-cli' // Match Ant artifact name + archiveClassifier = null // No classifier for the library JAR + archiveVersion = '' + destinationDirectory = layout.buildDirectory.dir('libs-temp') // Output to temp dir + + from(sourceSets.main.output) { + // Exclude the launcher classes + exclude 'com/mirth/connect/cli/launcher/**' + } +} + +// Create a custom task for the launcher JAR (mirth-cli-launcher.jar) +tasks.named('shadowJar', ShadowJar) { + dependsOn processResources, classes // Depend on compiled classes + archiveBaseName = 'mirth-cli-launcher' + archiveClassifier = '' + archiveVersion = '' + + from(sourceSets.main.output) { + // Include *only* the launcher classes + include 'com/mirth/connect/cli/launcher/**' + } + manifest { + attributes( + 'Main-Class': 'com.mirth.connect.cli.launcher.CommandLineLauncher' + // No Class-Path needed - application plugin handles runtime classpath + ) + } +} + +tasks.register('launcherJar', Jar) { + dependsOn processResources, classes // Depend on compiled classes + archiveBaseName = 'mirth-cli-launcher' + archiveClassifier = '' + archiveVersion = '' + destinationDirectory = layout.buildDirectory.dir('libs-temp') // Output to temp dir + + from(sourceSets.main.output) { + // Include *only* the launcher classes + include 'com/mirth/connect/cli/launcher/**' + } + manifest { + attributes( + 'Main-Class': 'com.mirth.connect.cli.launcher.CommandLineLauncher' + // No Class-Path needed - application plugin handles runtime classpath + ) + } +} + +application { + mainClass = 'com.mirth.connect.cli.launcher.CommandLineLauncher' +} + +// Configure the distribution +distributions { + main { // The default distribution created by the application plugin + distributionBaseName = 'mirth-cli' // Name of the zip/tar file + contents { + // Copy the library JAR into the distribution's lib folder + into('lib') { // Changed from 'cli-lib' to standard 'lib' + from(jar) // Add the main library JAR task output + // Dependencies are automatically included here by the plugin + } + // Copy the launcher JAR into the distribution's lib folder + into('lib') { + from(launcherJar) // Add the launcher JAR task output + } + // Copy configuration files into the distribution's conf folder + into('conf') { + from(sourceSets.main.resources) { + include '*.properties' // Include properties files from resources + } + } + // Copy startup scripts (generated by application plugin) + // into('bin') { // Default location + // } + } + } +} + +// Ensure the custom JARs are built before the distribution is assembled +tasks.distTar.dependsOn(jar, launcherJar) +tasks.distZip.dependsOn(jar, launcherJar) + +// Build depends on distribution assembly +tasks.build.dependsOn(tasks.distTar, tasks.distZip) + +// Testing configuration (inherited from root) +tasks.named('test', Test) { + // Add specific test config for command/cli if needed +} \ No newline at end of file diff --git a/command/build.properties b/command/build.properties deleted file mode 100644 index 87fc0ae726..0000000000 --- a/command/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -# top level directories -src=${basedir}/src -classes=${basedir}/classes -lib=${basedir}/lib -conf=${basedir}/conf -build=${basedir}/build -dist=${basedir}/dist -test=${basedir}/test -testlib=${basedir}/testlib -test_classes=${basedir}/test_classes -server=${basedir}/../server - -# jars -cli.jar=mirth-cli.jar -cli-launcher.jar=mirth-cli-launcher.jar \ No newline at end of file diff --git a/command/build.xml b/command/build.xml deleted file mode 100644 index 77d1c91a09..0000000000 --- a/command/build.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/main/java/com/mirth/connect/cli/CommandLineInterface.java similarity index 100% rename from command/src/com/mirth/connect/cli/CommandLineInterface.java rename to command/src/main/java/com/mirth/connect/cli/CommandLineInterface.java diff --git a/command/src/com/mirth/connect/cli/IntToken.java b/command/src/main/java/com/mirth/connect/cli/IntToken.java similarity index 100% rename from command/src/com/mirth/connect/cli/IntToken.java rename to command/src/main/java/com/mirth/connect/cli/IntToken.java diff --git a/command/src/com/mirth/connect/cli/Quit.java b/command/src/main/java/com/mirth/connect/cli/Quit.java similarity index 100% rename from command/src/com/mirth/connect/cli/Quit.java rename to command/src/main/java/com/mirth/connect/cli/Quit.java diff --git a/command/src/com/mirth/connect/cli/StringToken.java b/command/src/main/java/com/mirth/connect/cli/StringToken.java similarity index 100% rename from command/src/com/mirth/connect/cli/StringToken.java rename to command/src/main/java/com/mirth/connect/cli/StringToken.java diff --git a/command/src/com/mirth/connect/cli/Token.java b/command/src/main/java/com/mirth/connect/cli/Token.java similarity index 100% rename from command/src/com/mirth/connect/cli/Token.java rename to command/src/main/java/com/mirth/connect/cli/Token.java diff --git a/command/src/com/mirth/connect/cli/launcher/CommandLineLauncher.java b/command/src/main/java/com/mirth/connect/cli/launcher/CommandLineLauncher.java similarity index 100% rename from command/src/com/mirth/connect/cli/launcher/CommandLineLauncher.java rename to command/src/main/java/com/mirth/connect/cli/launcher/CommandLineLauncher.java diff --git a/command/src/com/mirth/connect/cli/launcher/ManifestDirectory.java b/command/src/main/java/com/mirth/connect/cli/launcher/ManifestDirectory.java similarity index 100% rename from command/src/com/mirth/connect/cli/launcher/ManifestDirectory.java rename to command/src/main/java/com/mirth/connect/cli/launcher/ManifestDirectory.java diff --git a/command/src/com/mirth/connect/cli/launcher/ManifestEntry.java b/command/src/main/java/com/mirth/connect/cli/launcher/ManifestEntry.java similarity index 100% rename from command/src/com/mirth/connect/cli/launcher/ManifestEntry.java rename to command/src/main/java/com/mirth/connect/cli/launcher/ManifestEntry.java diff --git a/command/src/com/mirth/connect/cli/launcher/ManifestFile.java b/command/src/main/java/com/mirth/connect/cli/launcher/ManifestFile.java similarity index 100% rename from command/src/com/mirth/connect/cli/launcher/ManifestFile.java rename to command/src/main/java/com/mirth/connect/cli/launcher/ManifestFile.java diff --git a/command/conf/log4j2-cli.properties b/command/src/main/resources/conf/log4j2-cli.properties similarity index 100% rename from command/conf/log4j2-cli.properties rename to command/src/main/resources/conf/log4j2-cli.properties diff --git a/command/conf/mirth-cli-config.properties b/command/src/main/resources/conf/mirth-cli-config.properties similarity index 100% rename from command/conf/mirth-cli-config.properties rename to command/src/main/resources/conf/mirth-cli-config.properties diff --git a/command/test/com/mirth/connect/cli/launcher/CommandLineLauncherTest.java b/command/src/test/com/mirth/connect/cli/launcher/CommandLineLauncherTest.java similarity index 100% rename from command/test/com/mirth/connect/cli/launcher/CommandLineLauncherTest.java rename to command/src/test/com/mirth/connect/cli/launcher/CommandLineLauncherTest.java diff --git a/command/testlib/junit-4.8.1.jar b/command/testlib/junit-4.8.1.jar deleted file mode 100644 index 524cd65ce5..0000000000 Binary files a/command/testlib/junit-4.8.1.jar and /dev/null differ diff --git a/donkey/.classpath b/donkey/.classpath deleted file mode 100644 index 54b8cc9972..0000000000 --- a/donkey/.classpath +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/donkey/.project b/donkey/.project deleted file mode 100644 index e2a5d1be04..0000000000 --- a/donkey/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Donkey - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/donkey/build.gradle b/donkey/build.gradle new file mode 100644 index 0000000000..fae527439a --- /dev/null +++ b/donkey/build.gradle @@ -0,0 +1,76 @@ +// donkey/build.gradle + +plugins { + id 'java-library' +} + +// Group and Version inherited from root project + +// Configure source sets - *Keep this if non-standard* +sourceSets { + main { + resources { + srcDirs = ['donkeydbconf'] + } + } + test { + resources { + srcDirs = ['conf'] + include 'donkey-testing.properties' + include '**/*.hl7' + } + } +} + +dependencies { + implementation 'com.google.guava:guava:28.2-jre' + implementation 'org.quartz-scheduler:quartz:2.3.2' + implementation 'com.google.inject:guice:4.1.0' +} + +// --- Task Configurations specific to Donkey --- + +// Configure the standard Jar task to produce the 'donkey-model.jar' artifact +tasks.named('jar', Jar) { + archiveBaseName = 'donkey' + archiveClassifier = 'model' + + manifest { + attributes( + 'Implementation-Title': 'Mirth Connect Donkey Model', + 'Implementation-Version': project.version // Inherited version + ) + } +} + +// Create a separate task for the 'donkey-server.jar' artifact +task serverJar(type: Jar) { + dependsOn sourceSets.main.output + archiveBaseName = 'donkey' + archiveClassifier = 'server' + + from(sourceSets.main.output) { + include 'com/mirth/connect/donkey/server/**' + include 'com/mirth/connect/donkey/model/**' + include 'com/mirth/connect/donkey/util/**' + } + + manifest { + attributes( + 'Implementation-Title': 'Mirth Connect Donkey Server', + 'Implementation-Version': project.version // Inherited version + ) + } +} + +// Ensure the serverJar task runs during the standard build process +tasks.named('assemble') { + dependsOn serverJar +} + +// Configure Test task - *Only add if Donkey needs specific settings* +tasks.named('test', Test) { + // Example: If Donkey tests need more memory than others + minHeapSize = "128m" // Can likely remove if defaults or root config is enough + maxHeapSize = "2048m" // Or '2g'. Common config is in root. Keep ONLY if Donkey needs more. +} \ No newline at end of file diff --git a/donkey/build.properties b/donkey/build.properties deleted file mode 100644 index ee14b3777c..0000000000 --- a/donkey/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -# top level directories -src=${basedir}/src/main/java -classes=${basedir}/classes -test=${basedir}/src/test/java -test_classes=${basedir}/test_classes -lib=${basedir}/lib -testlib=${basedir}/testlib -setup=${basedir}/setup -dbconf=${basedir}/donkeydbconf -docs=${basedir}/docs -server=${basedir}/../server - -# jars -server.jar=donkey-server.jar -model.jar=donkey-model.jar - -# setup directory -setup=${basedir}/setup -setup.lib=${setup}/lib -setup.docs=${setup}/docs diff --git a/donkey/build.xml b/donkey/build.xml deleted file mode 100644 index 110c1a8168..0000000000 --- a/donkey/build.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/donkey/testlib/aopalliance-repackaged-2.4.0-b31.jar b/donkey/testlib/aopalliance-repackaged-2.4.0-b31.jar deleted file mode 100644 index 7f59718c81..0000000000 Binary files a/donkey/testlib/aopalliance-repackaged-2.4.0-b31.jar and /dev/null differ diff --git a/donkey/testlib/byte-buddy-1.8.8.jar b/donkey/testlib/byte-buddy-1.8.8.jar deleted file mode 100644 index 7b964f6055..0000000000 Binary files a/donkey/testlib/byte-buddy-1.8.8.jar and /dev/null differ diff --git a/donkey/testlib/byte-buddy-agent-1.8.8.jar b/donkey/testlib/byte-buddy-agent-1.8.8.jar deleted file mode 100644 index 1d32e2ef73..0000000000 Binary files a/donkey/testlib/byte-buddy-agent-1.8.8.jar and /dev/null differ diff --git a/donkey/testlib/javax.inject-2.4.0-b31.jar b/donkey/testlib/javax.inject-2.4.0-b31.jar deleted file mode 100644 index 1f60d98a76..0000000000 Binary files a/donkey/testlib/javax.inject-2.4.0-b31.jar and /dev/null differ diff --git a/donkey/testlib/junit-4.8.1.jar b/donkey/testlib/junit-4.8.1.jar deleted file mode 100644 index 524cd65ce5..0000000000 Binary files a/donkey/testlib/junit-4.8.1.jar and /dev/null differ diff --git a/donkey/testlib/mockito-core-2.7.9.jar b/donkey/testlib/mockito-core-2.7.9.jar deleted file mode 100644 index 926872f2ae..0000000000 Binary files a/donkey/testlib/mockito-core-2.7.9.jar and /dev/null differ diff --git a/donkey/testlib/objenesis-2.5.1.jar b/donkey/testlib/objenesis-2.5.1.jar deleted file mode 100644 index 31b245b99c..0000000000 Binary files a/donkey/testlib/objenesis-2.5.1.jar and /dev/null differ diff --git a/generator/.classpath b/generator/.classpath deleted file mode 100644 index cb075c277e..0000000000 --- a/generator/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/generator/.project b/generator/.project deleted file mode 100644 index 2c663857ca..0000000000 --- a/generator/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Generator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/generator/build.gradle b/generator/build.gradle new file mode 100644 index 0000000000..590e4c97c3 --- /dev/null +++ b/generator/build.gradle @@ -0,0 +1,133 @@ +plugins { + id 'java' +} + +// Define directory variables +def generatorClassesDir = project.file("${project.buildDir}/classes/java/generator") +def vocabGeneratedSrcDir = project.file("${project.buildDir}/generated-sources/vocab") +def vocabClassesDir = project.file("${project.buildDir}/classes/java/vocab") +def vocabVersion = '1.2' +def referenceDir = project.file('reference') +def templatesDir = project.file('templates') + +// Make them available to ext for tasks that use ext properties +ext { + generatorClassesDir = generatorClassesDir + vocabGeneratedSrcDir = vocabGeneratedSrcDir + vocabClassesDir = vocabClassesDir + vocabVersion = vocabVersion + referenceDir = referenceDir + templatesDir = templatesDir +} + +// --- Configurations --- +// Create a configuration to hold the generator's runtime classpath +configurations { + generatorRuntimeClasspath { + canBeConsumed = false + canBeResolved = true + // Inherit dependencies declared in root build + extendsFrom configurations.implementation + } +} + +// Define dependencies +dependencies { + // Add local jar dependencies from lib directory + // implementation fileTree(dir: 'lib', include: '*.jar') + + // Add specific dependencies needed by the generator + implementation 'org.apache.velocity:velocity-engine-core:2.3' +} + +// --- Tasks --- + +// Step 1: Compile the generator code +task compileGeneratorCode(type: JavaCompile) { + description = 'Compiles the generator code' + source = sourceSets.main.java.srcDirs + // Add test dependencies to classpath for main compilation since tests are in src/main/java + classpath = configurations.compileClasspath + configurations.testRuntimeClasspath + destinationDirectory.set(generatorClassesDir) + // Standard Java compile options + sourceCompatibility = project.hasProperty('sourceCompatibility') ? project.sourceCompatibility : '1.8' + targetCompatibility = project.hasProperty('targetCompatibility') ? project.targetCompatibility : '1.8' +} + +// Step 2: Process resources for generator +task processGeneratorResources(type: Copy) { + description = 'Processes resources for the generator' + from sourceSets.main.resources.srcDirs + into "${project.buildDir}/resources/main" +} + +// Step 3: Generate vocabulary source code +task generateVocabSource(type: JavaExec) { + description = 'Generates the HL7 v2 vocabulary source files' + group = 'build' + + // This task needs the compiled generator code and its dependencies + classpath = configurations.generatorRuntimeClasspath + files(generatorClassesDir, "${project.buildDir}/resources/main") + + mainClass = 'com.mirth.connect.model.generator.HL7ModelGenerator' + + // Inputs and outputs for incremental build + inputs.dir(referenceDir).withPathSensitivity(PathSensitivity.RELATIVE) + inputs.dir(templatesDir).withPathSensitivity(PathSensitivity.RELATIVE) + outputs.dir(vocabGeneratedSrcDir) + + // Arguments to pass to the generator + args = [referenceDir.name, vocabGeneratedSrcDir.absolutePath, templatesDir.name] + + // Explicitly depends on the generator code compilation + dependsOn compileGeneratorCode, processGeneratorResources, processResources +} + +// Step 4: Compile the generated vocabulary code +task compileVocabCode(type: JavaCompile) { + description = 'Compiles the generated vocabulary code' + source = vocabGeneratedSrcDir + classpath = configurations.compileClasspath + files(generatorClassesDir) + destinationDirectory.set(vocabClassesDir) + sourceCompatibility = project.hasProperty('sourceCompatibility') ? project.sourceCompatibility : '1.8' + targetCompatibility = project.hasProperty('targetCompatibility') ? project.targetCompatibility : '1.8' + + // This task depends on the source generation + dependsOn generateVocabSource +} + +// Configure the JAR task to include both generator and vocab classes +tasks.named('jar', Jar) { + description = 'Creates a JAR file of the HL7v2 vocabulary' + dependsOn compileVocabCode + + archiveBaseName = 'mirth-vocab' + archiveVersion = '' + archiveClassifier = null + + // Include the compiled vocab classes + from(vocabClassesDir) + + // Include only specific base classes from generator output + from(generatorClassesDir) { + include 'com/mirth/connect/model/hl7v2/**' + } + + manifest { + attributes( + 'Implementation-Title': 'Mirth Connect HL7v2 Vocabulary', + 'Implementation-Version': archiveVersion.get() + ) + } +} + +// Clean task +tasks.named('clean', Delete) { + delete += [vocabGeneratedSrcDir, generatorClassesDir, vocabClassesDir] +} + +// Make sure the build task depends on our jar +tasks.build.dependsOn(tasks.jar) + +// Skip the standard Java compileJava task - we're doing compilation manually +tasks.compileJava.enabled = false \ No newline at end of file diff --git a/generator/build.properties b/generator/build.properties deleted file mode 100644 index a9c57025ab..0000000000 --- a/generator/build.properties +++ /dev/null @@ -1,12 +0,0 @@ -generator.src=${basedir}/src -generator.lib=${basedir}/lib -generator.classes=${basedir}/classes -generator.dist=${basedir}/dist -generator.jar=model-generator.jar - -vocab=${basedir}/vocab -vocab.src=${vocab}/src -vocab.classes=${vocab}/classes -vocab.dist=${vocab}/dist -vocab.version=1.2 -vocab.jar=mirth-vocab-${vocab.version}.jar \ No newline at end of file diff --git a/generator/build.xml b/generator/build.xml deleted file mode 100644 index b5647c7ae1..0000000000 --- a/generator/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/generator/src/com/mirth/connect/model/generator/HL7ModelGenerator.java b/generator/src/main/java/com/mirth/connect/model/generator/HL7ModelGenerator.java similarity index 100% rename from generator/src/com/mirth/connect/model/generator/HL7ModelGenerator.java rename to generator/src/main/java/com/mirth/connect/model/generator/HL7ModelGenerator.java diff --git a/generator/src/com/mirth/connect/model/generator/test/HL7ModelGeneratorTest.java b/generator/src/main/java/com/mirth/connect/model/generator/test/HL7ModelGeneratorTest.java similarity index 100% rename from generator/src/com/mirth/connect/model/generator/test/HL7ModelGeneratorTest.java rename to generator/src/main/java/com/mirth/connect/model/generator/test/HL7ModelGeneratorTest.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/Component.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/Component.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/Component.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/Component.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/Composite.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/Composite.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/Composite.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/Composite.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/Message.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/Message.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/Message.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/Message.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/Segment.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/Segment.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/Segment.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/Segment.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_ANY.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_ANY.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_ANY.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_ANY.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_Date.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_Date.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_Date.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_Date.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_DateTime.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_DateTime.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_DateTime.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_DateTime.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_Double.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_Double.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_Double.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_Double.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_Integer.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_Integer.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_Integer.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_Integer.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_String.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_String.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_String.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_String.java diff --git a/generator/src/com/mirth/connect/model/hl7v2/_Time.java b/generator/src/main/java/com/mirth/connect/model/hl7v2/_Time.java similarity index 100% rename from generator/src/com/mirth/connect/model/hl7v2/_Time.java rename to generator/src/main/java/com/mirth/connect/model/hl7v2/_Time.java diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..377538c996 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..4ac3234a6a --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..9bbc975c74 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..37f853b1c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..faf93008b7 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..9d21a21834 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/manager/.classpath b/manager/.classpath deleted file mode 100644 index 391b7aba01..0000000000 --- a/manager/.classpath +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/manager/.project b/manager/.project deleted file mode 100644 index c6e58661fd..0000000000 --- a/manager/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Manager - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/manager/ant-build.xml b/manager/ant-build.xml deleted file mode 100644 index 4733353eba..0000000000 --- a/manager/ant-build.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Mirth Manager Build Help - ----------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/manager/build.gradle b/manager/build.gradle new file mode 100644 index 0000000000..9d535a8f4d --- /dev/null +++ b/manager/build.gradle @@ -0,0 +1,65 @@ +plugins { + id 'java' + id 'application' + id 'com.gradleup.shadow' version '8.3.6' +} + +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +dependencies { + implementation project(':donkey') + implementation project(':server') + + implementation 'com.miglayout:miglayout-swing:4.2' + implementation 'com.jgoodies:looks:2.2.2' + implementation 'org.swinglabs:swingx-core:1.6.2-2' + implementation 'com.miglayout:miglayout-swing:4.2' + + runtimeOnly project(path: ':server', configuration: 'runtimeElements') // Ensures server classes & resources are available +} + +application { + mainClass = 'com.mirth.connect.manager.Manager' +} + +distributions { + main { + distributionBaseName = 'mirth-manager' // Name of the zip/tar file + } +} + +// Configure the main JAR task +tasks.named('shadowJar', ShadowJar) { + archiveBaseName = 'mirth-manager-launcher' + archiveClassifier = '' + archiveVersion = '' + + manifest { + attributes( + 'Main-Class': application.mainClass, + 'Implementation-Title': 'Mirth Connect Manager' + ) + } +} + +// Configure the main JAR task +tasks.named('jar', Jar) { + archiveBaseName = 'mirth-manager' + //archiveClassifier = 'app' + archiveVersion = '' + + manifest { + attributes( + 'Main-Class': application.mainClass, + 'Implementation-Title': 'Mirth Connect Manager' + ) + } +} + +// In manager/build.gradle, within the application { ... } block or separately: +tasks.named('run', JavaExec) { + workingDir = project(':server').projectDir +} + +// Build depends on distribution assembly +tasks.build.dependsOn(tasks.distTar, tasks.distZip) \ No newline at end of file diff --git a/manager/build.properties b/manager/build.properties deleted file mode 100644 index a2b0f4ece8..0000000000 --- a/manager/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -# top level directories -src=${basedir}/src -classes=${basedir}/classes -lib=${basedir}/lib -logs=${basedir}/logs -dist=${basedir}/dist -dist.source=${dist}/source - -# jars -manager.jar=mirth-manager-launcher.jar \ No newline at end of file diff --git a/manager/src/com/mirth/connect/manager/BareBonesBrowserLaunch.java b/manager/src/main/java/com/mirth/connect/manager/BareBonesBrowserLaunch.java similarity index 100% rename from manager/src/com/mirth/connect/manager/BareBonesBrowserLaunch.java rename to manager/src/main/java/com/mirth/connect/manager/BareBonesBrowserLaunch.java diff --git a/manager/src/com/mirth/connect/manager/CmdUtil.java b/manager/src/main/java/com/mirth/connect/manager/CmdUtil.java similarity index 100% rename from manager/src/com/mirth/connect/manager/CmdUtil.java rename to manager/src/main/java/com/mirth/connect/manager/CmdUtil.java diff --git a/manager/src/com/mirth/connect/manager/DisplayUtil.java b/manager/src/main/java/com/mirth/connect/manager/DisplayUtil.java similarity index 100% rename from manager/src/com/mirth/connect/manager/DisplayUtil.java rename to manager/src/main/java/com/mirth/connect/manager/DisplayUtil.java diff --git a/manager/src/com/mirth/connect/manager/HeapSizeDialog.java b/manager/src/main/java/com/mirth/connect/manager/HeapSizeDialog.java similarity index 100% rename from manager/src/com/mirth/connect/manager/HeapSizeDialog.java rename to manager/src/main/java/com/mirth/connect/manager/HeapSizeDialog.java diff --git a/manager/src/com/mirth/connect/manager/LinuxServiceController.java b/manager/src/main/java/com/mirth/connect/manager/LinuxServiceController.java similarity index 100% rename from manager/src/com/mirth/connect/manager/LinuxServiceController.java rename to manager/src/main/java/com/mirth/connect/manager/LinuxServiceController.java diff --git a/manager/src/com/mirth/connect/manager/MacServiceController.java b/manager/src/main/java/com/mirth/connect/manager/MacServiceController.java similarity index 100% rename from manager/src/com/mirth/connect/manager/MacServiceController.java rename to manager/src/main/java/com/mirth/connect/manager/MacServiceController.java diff --git a/manager/src/com/mirth/connect/manager/Manager.java b/manager/src/main/java/com/mirth/connect/manager/Manager.java similarity index 100% rename from manager/src/com/mirth/connect/manager/Manager.java rename to manager/src/main/java/com/mirth/connect/manager/Manager.java diff --git a/manager/src/com/mirth/connect/manager/ManagerConstants.java b/manager/src/main/java/com/mirth/connect/manager/ManagerConstants.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ManagerConstants.java rename to manager/src/main/java/com/mirth/connect/manager/ManagerConstants.java diff --git a/manager/src/com/mirth/connect/manager/ManagerController.java b/manager/src/main/java/com/mirth/connect/manager/ManagerController.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ManagerController.java rename to manager/src/main/java/com/mirth/connect/manager/ManagerController.java diff --git a/manager/src/com/mirth/connect/manager/ManagerDialog.java b/manager/src/main/java/com/mirth/connect/manager/ManagerDialog.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ManagerDialog.java rename to manager/src/main/java/com/mirth/connect/manager/ManagerDialog.java diff --git a/manager/src/com/mirth/connect/manager/ManagerTray.java b/manager/src/main/java/com/mirth/connect/manager/ManagerTray.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ManagerTray.java rename to manager/src/main/java/com/mirth/connect/manager/ManagerTray.java diff --git a/manager/src/com/mirth/connect/manager/MirthHeadingPanel.java b/manager/src/main/java/com/mirth/connect/manager/MirthHeadingPanel.java similarity index 100% rename from manager/src/com/mirth/connect/manager/MirthHeadingPanel.java rename to manager/src/main/java/com/mirth/connect/manager/MirthHeadingPanel.java diff --git a/manager/src/com/mirth/connect/manager/MirthTheme.java b/manager/src/main/java/com/mirth/connect/manager/MirthTheme.java similarity index 100% rename from manager/src/com/mirth/connect/manager/MirthTheme.java rename to manager/src/main/java/com/mirth/connect/manager/MirthTheme.java diff --git a/manager/src/com/mirth/connect/manager/PlatformUI.java b/manager/src/main/java/com/mirth/connect/manager/PlatformUI.java similarity index 100% rename from manager/src/com/mirth/connect/manager/PlatformUI.java rename to manager/src/main/java/com/mirth/connect/manager/PlatformUI.java diff --git a/manager/src/com/mirth/connect/manager/ServiceController.java b/manager/src/main/java/com/mirth/connect/manager/ServiceController.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ServiceController.java rename to manager/src/main/java/com/mirth/connect/manager/ServiceController.java diff --git a/manager/src/com/mirth/connect/manager/ServiceControllerFactory.java b/manager/src/main/java/com/mirth/connect/manager/ServiceControllerFactory.java similarity index 100% rename from manager/src/com/mirth/connect/manager/ServiceControllerFactory.java rename to manager/src/main/java/com/mirth/connect/manager/ServiceControllerFactory.java diff --git a/manager/src/com/mirth/connect/manager/WindowsServiceController.java b/manager/src/main/java/com/mirth/connect/manager/WindowsServiceController.java similarity index 100% rename from manager/src/com/mirth/connect/manager/WindowsServiceController.java rename to manager/src/main/java/com/mirth/connect/manager/WindowsServiceController.java diff --git a/manager/src/com/mirth/connect/manager/components/MirthComboBox.java b/manager/src/main/java/com/mirth/connect/manager/components/MirthComboBox.java similarity index 100% rename from manager/src/com/mirth/connect/manager/components/MirthComboBox.java rename to manager/src/main/java/com/mirth/connect/manager/components/MirthComboBox.java diff --git a/manager/src/com/mirth/connect/manager/components/MirthFieldConstraints.java b/manager/src/main/java/com/mirth/connect/manager/components/MirthFieldConstraints.java similarity index 100% rename from manager/src/com/mirth/connect/manager/components/MirthFieldConstraints.java rename to manager/src/main/java/com/mirth/connect/manager/components/MirthFieldConstraints.java diff --git a/manager/src/com/mirth/connect/manager/components/MirthPasswordField.java b/manager/src/main/java/com/mirth/connect/manager/components/MirthPasswordField.java similarity index 100% rename from manager/src/com/mirth/connect/manager/components/MirthPasswordField.java rename to manager/src/main/java/com/mirth/connect/manager/components/MirthPasswordField.java diff --git a/manager/src/com/mirth/connect/manager/components/MirthTextField.java b/manager/src/main/java/com/mirth/connect/manager/components/MirthTextField.java similarity index 100% rename from manager/src/com/mirth/connect/manager/components/MirthTextField.java rename to manager/src/main/java/com/mirth/connect/manager/components/MirthTextField.java diff --git a/manager/src/com/mirth/connect/manager/images/NG_MC-ServerManager_Icon_F_32x32.png b/manager/src/main/resources/com/mirth/connect/manager/images/NG_MC-ServerManager_Icon_F_32x32.png similarity index 100% rename from manager/src/com/mirth/connect/manager/images/NG_MC-ServerManager_Icon_F_32x32.png rename to manager/src/main/resources/com/mirth/connect/manager/images/NG_MC-ServerManager_Icon_F_32x32.png diff --git a/manager/src/com/mirth/connect/manager/images/NG_MC_Icon_32x32.png b/manager/src/main/resources/com/mirth/connect/manager/images/NG_MC_Icon_32x32.png similarity index 100% rename from manager/src/com/mirth/connect/manager/images/NG_MC_Icon_32x32.png rename to manager/src/main/resources/com/mirth/connect/manager/images/NG_MC_Icon_32x32.png diff --git a/manager/src/com/mirth/connect/manager/images/NG_MC_Icon_Grey_32x32.png b/manager/src/main/resources/com/mirth/connect/manager/images/NG_MC_Icon_Grey_32x32.png similarity index 100% rename from manager/src/com/mirth/connect/manager/images/NG_MC_Icon_Grey_32x32.png rename to manager/src/main/resources/com/mirth/connect/manager/images/NG_MC_Icon_Grey_32x32.png diff --git a/manager/src/com/mirth/connect/manager/images/header_nologo.png b/manager/src/main/resources/com/mirth/connect/manager/images/header_nologo.png similarity index 100% rename from manager/src/com/mirth/connect/manager/images/header_nologo.png rename to manager/src/main/resources/com/mirth/connect/manager/images/header_nologo.png diff --git a/manager/src/com/mirth/connect/manager/images/wrench.png b/manager/src/main/resources/com/mirth/connect/manager/images/wrench.png similarity index 100% rename from manager/src/com/mirth/connect/manager/images/wrench.png rename to manager/src/main/resources/com/mirth/connect/manager/images/wrench.png diff --git a/manager/src/log4j2.properties b/manager/src/main/resources/log4j2.properties similarity index 100% rename from manager/src/log4j2.properties rename to manager/src/main/resources/log4j2.properties diff --git a/server/.classpath b/server/.classpath deleted file mode 100644 index 79310f1f03..0000000000 --- a/server/.classpath +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/.project b/server/.project deleted file mode 100644 index d4d4f9ae99..0000000000 --- a/server/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/server/build.bat b/server/build.bat deleted file mode 100644 index ce6335f243..0000000000 --- a/server/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -set ANT_OPTS=-Xmx256m -ant -f mirth-build.xml -pause \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle new file mode 100644 index 0000000000..28b8b453de --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,374 @@ +plugins { + id 'java' // Start with this, can add 'application' later if needed for distribution + id 'application' + id 'com.gradleup.shadow' version '8.3.6' +} + +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.time.format.TextStyle +import java.util.Locale +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +// Group and Version likely inherited from root project + +// Configure source sets assuming standard layout refactor is done +// (src/main/java, src/main/resources, etc.) +// If refactor is not done, add a sourceSets block similar to previous modules. +sourceSets { + main { + resources { + // Exclude specific files if necessary (e.g., javadoc sources if 'docs' contains them) + exclude '**/javadocs/**' + } + } +} + +dependencies { + // --- Project Dependencies --- + // Assuming donkey produces 'donkey-model' and 'donkey-server' classifiers + // Adjust if donkey just produces one JAR containing everything needed + implementation project(':donkey') + // Or specifically: implementation project(path: ':donkey') // relies on java-library publications + + implementation project(':generator') // Depends on mirth-vocab.jar + + // --- External Dependencies (Mapped from server/lib) --- + + implementation 'software.amazon.awssdk:aws-core:2.15.28' + implementation 'software.amazon.awssdk:aws-json-protocol:2.15.28' + implementation 'software.amazon.awssdk:aws-query-protocol:2.15.28' + implementation 'software.amazon.awssdk:aws-xml-protocol:2.15.28' + implementation 'software.amazon.awssdk:s3:2.15.28' + implementation 'software.amazon.awssdk:sts:2.15.28' + implementation 'software.amazon.awssdk:apache-client:2.15.28' + + // Bouncy Castle (Crypto) + implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1' // Use appropriate JDK version suffix + implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' + implementation 'org.bouncycastle:bcutil-jdk18on:1.78.1' + + // Guice (Dependency Injection) + implementation 'com.google.inject:guice:4.1.0' // Old + + // HAPI (HL7 Parser) + implementation 'ca.uhn.hapi:hapi-base:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v21:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v22:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v23:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v231:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v24:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v25:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v251:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v26:2.3' + implementation 'ca.uhn.hapi:hapi-structures-v27:2.3' + // implementation 'ca.uhn.hapi:hapi-structures-v28:2.3' // Check if v2.8 structure jars exist at 2.3 base + // implementation 'ca.uhn.hapi:hapi-structures-v281:2.3' + + // HikariCP (DB Pooling) + implementation 'com.zaxxer:HikariCP:2.5.1' // Very old + + // Jackson (JSON processing) + implementation 'com.fasterxml.jackson.core:jackson-core:2.14.3' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.3' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.3' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.3' + + // Javassist (Bytecode manipulation) + implementation 'org.javassist:javassist:3.26.0-GA' + + // Javax / Jakarta APIs (use compileOnly for standard APIs provided by container/JDK) + compileOnly 'javax.servlet:javax.servlet-api:3.1.0' // Provided by Jetty + compileOnly 'javax.websocket:javax.websocket-api:1.1' // If using websockets, check if Jetty provides impl + compileOnly 'javax.mail:javax.mail-api:1.5.0' // Use API jar, impl provided by Angus Mail likely + implementation 'com.sun.mail:javax.mail:1.5.0' // Actual implementation if needed directly + compileOnly 'javax.activation:javax.activation-api:1.2.0' // Standard API + implementation 'com.sun.activation:javax.activation:1.2.0' // Implementation if needed + compileOnly 'javax.annotation:javax.annotation-api:1.3.2' // Standard API + compileOnly 'javax.inject:javax.inject:1' // Standard API, Guice provides impl + compileOnly 'javax.json:javax.json-api:1.0' // Standard API + implementation 'org.glassfish:javax.json:1.0.4' // Implementation + compileOnly 'javax.ws.rs:javax.ws.rs-api:2.0.1' // Standard API, Jersey provides impl + // JAXB APIs (compileOnly if using JDK 9+ and relying on JDK modules) + // implementation might be needed for JDK 8 or explicit usage + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3' // Use Jakarta namespace version + implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.3' // Implementation + // JAX-WS APIs (compileOnly if relying on JDK, implementation otherwise) + implementation 'jakarta.xml.ws:jakarta.xml.ws-api:2.3.3' // Use Jakarta namespace version + implementation 'com.sun.xml.ws:jaxws-rt:2.3.3' // Implementation + // SOAP API + compileOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0' // Often provided by JAX-WS runtime + + // JDOM2 (XML processing) + implementation 'org.jdom:jdom2:2.0.6.1' // Check version + + // Jersey (JAX-RS Implementation) + implementation 'org.glassfish.jersey.core:jersey-server:2.22.1' + implementation 'org.glassfish.jersey.containers:jersey-container-servlet:2.22.1' + implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.1' + implementation 'org.glassfish.jersey.core:jersey-client:2.22.1' + implementation 'org.glassfish.jersey.media:jersey-media-jaxb:2.22.1' + implementation 'org.glassfish.jersey.media:jersey-media-multipart:2.22.1' + + // Jetty (Servlet Container) + implementation 'org.eclipse.jetty:jetty-server:9.4.53.v20231009' + implementation 'org.eclipse.jetty:jetty-servlet:9.4.53.v20231009' + implementation 'org.eclipse.jetty:jetty-webapp:9.4.53.v20231009' + implementation 'org.eclipse.jetty:jetty-plus:9.4.53.v20231009' // For JNDI + implementation 'org.eclipse.jetty:jetty-annotations:9.4.53.v20231009' + implementation 'org.eclipse.jetty:jetty-rewrite:9.4.53.v20231009' + // JSP dependencies (if supporting JSP pages within Mirth?) + // implementation 'org.eclipse.jetty:jetty-jsp:9.4.53.v20231009' // Check if this exists/is needed + // implementation 'org.eclipse.jetty:apache-jsp:9.4.53.v20231009' + // implementation 'org.glassfish.web:jakarta.servlet.jsp.jstl:1.2.6' // JSTL Impl + + // JMS API (compileOnly, implementation provided externally) + compileOnly 'javax.jms:javax.jms-api:2.0.1' // Or Geronimo spec artifact if preferred + // compileOnly 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1' + + // JNA (OS integration) + implementation 'net.java.dev.jna:jna:4.5.2' + implementation 'net.java.dev.jna:jna-platform:4.5.2' + + // Joda Time (Date/Time library - consider migrating to java.time) + implementation 'joda-time:joda-time:2.9.9' // Old + + // JSch (SSH/SFTP) + implementation 'com.github.mwiede:jsch:0.2.18' // Use a fork, original is stagnant + + // MyBatis (Persistence framework) + implementation 'org.mybatis:mybatis:3.1.1' // Very old + + // Oshi (OS Hardware/System info) + implementation 'com.github.oshi:oshi-core:3.9.1' // Old + + // Quartz (Scheduler - already declared by Donkey? Check scope/version) + implementation 'org.quartz-scheduler:quartz:2.3.2' + + // Staxon (JSON <-> XML) + implementation 'de.odysseus.staxon:staxon:1.3' + + // Swagger (API Documentation) + implementation 'io.swagger.core.v3:swagger-core:2.0.10' // Use v3 artifacts + implementation 'io.swagger.core.v3:swagger-annotations:2.0.10' + implementation 'io.swagger.core.v3:swagger-models:2.0.10' + implementation 'io.swagger.core.v3:swagger-integration:2.0.10' + implementation 'io.swagger.core.v3:swagger-jaxrs2:2.0.10' + implementation 'io.swagger.core.v3:swagger-jaxrs2-servlet-initializer:2.0.10' // Check artifactId + implementation 'org.reflections:reflections:0.9.10' // Dependency of Swagger + + // Xerces (XML Parser implementation) + implementation 'xerces:xercesImpl:2.12.2' // Generally rely on JDK's parser unless specific features needed + // XML APIs (usually provided by JDK) + // compileOnly 'xml-apis:xml-apis:1.4.01' + + // XStream (XML Serialization) + implementation 'com.thoughtworks.xstream:xstream:1.4.20' + // implementation 'xpp3:xpp3_min:1.1.4c' // Transitive + + // Zip4j + implementation 'net.lingala.zip4j:zip4j:1.3.3' // Very old version, consider updating + + // ClassGraph (Classpath scanning) + implementation 'io.github.classgraph:classgraph:4.8.53' + + // DCM4CHE + implementation 'dcm4che:dcm4che-core:2.0.29' + implementation 'dcm4che:dcm4che-net:2.0.29' + implementation 'dcm4che:dcm4che-filecache:2.0.29' + implementation 'dcm4che.tool:dcm4che-tool-dcmrcv:2.0.29' + implementation 'dcm4che.tool:dcm4che-tool-dcmsnd:2.0.29' + + implementation 'backport-util-concurrent:backport-util-concurrent:3.1' + + implementation 'net.imagej:ij:1.54p' + implementation 'org.codelibs:jcifs:2.1.10' + implementation 'com.lowagie:itext:2.1.7' + implementation 'com.lowagie:itext-rtf:2.1.7' + implementation 'wsdl4j:wsdl4j:1.6.2' + implementation 'org.apache.pdfbox:pdfbox:2.0.24' + implementation 'org.xhtmlrenderer:flying-saucer-pdf:9.1.20' + implementation 'com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.9' + implementation 'com.openhtmltopdf:openhtmltopdf-core:1.0.9' + implementation 'slide:slide-webdavlib:2.1' + implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1' +} + + +// --- Task Definitions --- + +// Task to create mirth-crypto.jar +tasks.register('cryptoJar', Jar) { + dependsOn processResources, classes // Depends on compiled classes and resources + archiveBaseName = 'mirth-crypto' + archiveVersion = '' + + from(sourceSets.main.output) { // Include compiled classes and resources + include 'com/mirth/commons/encryption/**' + } +} + +// Task to create mirth-client-core.jar +tasks.register('clientCoreJar' , Jar) { + dependsOn processResources, classes + archiveBaseName = 'mirth-client-core' + archiveVersion = '' + + from(sourceSets.main.output) { + include 'com/mirth/connect/client/core/**' + include 'com/mirth/connect/model/**' // Include models shared with client + include 'com/mirth/connect/userutil/**' + include 'com/mirth/connect/util/**' + include 'com/mirth/connect/server/util/ResourceUtil.class' + include 'com/mirth/connect/server/util/DebuggerUtil.class' + include 'org/mozilla/**' // Rhino classes bundled? Risky. Better to depend on Rhino JAR. + include 'org/glassfish/jersey/**' // Jersey classes bundled? Risky. Better to depend on Jersey JARs. + include 'de/odysseus/staxon/**' // Staxon classes bundled? Risky. Better to depend on Staxon JAR. + include 'net/lingala/zip4j/unzip/**' // zip4j classes bundled? Risky. Better to depend on zip4j JAR. + } + + from (tasks.named('generateVersionProperties')) +} + +// Task to create mirth-dbconf.jar +tasks.register('dbconfJar', Jar) { + dependsOn processResources // Only needs resources + archiveBaseName = 'mirth-dbconf' + from(sourceSets.main.resources) { // Include from processed resources + include 'dbconf/**' + } +} + +// Task to create userutil-sources.jar (example) +tasks.register('userutilSourcesJar', Jar) { + archiveBaseName = 'mirth-userutil-sources' // Or maybe 'userutil' + from(sourceSets.main.java) { // Package sources directly + include 'com/mirth/connect/userutil/**.java' + include 'com/mirth/connect/server/userutil/**.java' + exclude '**/package-info.java' + } +} + +application { + mainClass = 'com.mirth.connect.server.launcher.MirthLauncher' +} + +tasks.named('shadowJar', ShadowJar) { + archiveBaseName = 'mirth-server-launcher' + archiveClassifier = '' + archiveVersion = '' + + manifest { + attributes 'Main-Class': application.mainClass // Good practice to set it here too + } + + from(sourceSets.main.output) { + include 'com/mirth/connect/server/launcher/**' + include 'com/mirth/connect/server/extprops/**' + } +} + +// Configure the main 'jar' task for mirth-server.jar +tasks.named('jar', Jar) { + archiveBaseName = 'mirth-server' + archiveClassifier = null // No classifier for the main JAR + archiveVersion = '' + + // Exclude classes/resources packaged in other specific JARs + from(sourceSets.main.output) { + exclude 'com/mirth/commons/encryption/**' // In cryptoJar + exclude 'com/mirth/connect/client/core/**' // In clientCoreJar + exclude 'dbconf/**' // In dbconfJar + exclude 'com/mirth/connect/server/launcher/**' + exclude 'com/mirth/connect/server/extprops/**' + exclude 'com/mirth/connect/connectors/**' + exclude 'com/mirth/connect/plugins/**' + } + + from (sourceSets.main.resources) { + include 'jnlp/mirth-client.jnlp' + } +} + +// Define a task to generate the version.properties file +tasks.register('generateVersionProperties') { + // Use description and group for better organization + description = 'Generates the version.properties file with build information.' + + // --- Configuration --- + // Define where the output file will be written. + // Using project.layout conventions is recommended. + def outputDir = project.layout.buildDirectory.dir('generated/version') + // Define the output file property using Gradle's lazy Property API + final RegularFileProperty versionFile = project.objects.fileProperty().convention( + outputDir.map { dir -> dir.file('version.properties') } + ) + + String currentProjectVersion = project.version.toString() // Ensure it's a string + + // --- Inputs and Outputs for Incremental Build --- + // Declare the output file for up-to-date checks + outputs.file(versionFile) + .withPropertyName('versionFile') // Good practice for build cache diagnostics + + // Declare the project version as an input + inputs.property('projectVersion', project.version) + + // --- Task Action --- + doLast { // Use doLast to ensure configuration phase is complete + // Get necessary info inside the execution phase + if (currentProjectVersion == 'unspecified') { + logger.log(LogLevel.WARN, "Project version is 'unspecified'. Setting default in version.properties.") + currentProjectVersion = "0.0.0-SNAPSHOT" // Provide a default or fail build + } + + // Get current time (consider time zone) + def zoneId = ZoneId.systemDefault() // Or specify one like ZoneId.of("UTC") + def now = ZonedDateTime.now(zoneId) + + // Formatters + // #Tue, 06 May 2025 00:29:58 +0200 + def timestampFormatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss Z", Locale.ENGLISH) + // May 6, 2025 + def dateFormatter = DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH) + + // Build the content + String content = """\ + #${now.format(timestampFormatter)} + + mirth.version=${currentProjectVersion} + mirth.date=${now.format(dateFormatter)} + """.stripIndent() // stripIndent removes leading whitespace for clean multiline strings + + // Get the actual file object from the property + File targetFile = versionFile.get().asFile + + // Ensure the parent directory exists + targetFile.parentFile.mkdirs() + + // Write the content to the file + targetFile.text = content + + logger.lifecycle("Generated version properties file at: ${targetFile}") + } +} + +sourceSets.main.resources { tasks.named('generateVersionProperties').map { it.outputs.files.singleFile.parent } } + +tasks.named('processResources') { + dependsOn 'generateVersionProperties' +} + +tasks.named('clean') { + delete tasks.named('generateVersionProperties').map { it.outputs.files } +} + +// --- Build Lifecycle --- +// Ensure custom JAR tasks run during build +tasks.named('assemble') { + dependsOn clientCoreJar, cryptoJar, dbconfJar, userutilSourcesJar // Add other custom JARs +} \ No newline at end of file diff --git a/server/build.properties b/server/build.properties deleted file mode 100644 index 00c2e82760..0000000000 --- a/server/build.properties +++ /dev/null @@ -1,51 +0,0 @@ -# top level directories -src=${basedir}/src -test=${basedir}/test -classes=${basedir}/classes -test_classes=${basedir}/test_classes -lib=${basedir}/lib -lib.extensions=${lib}/extensions -testlib=${basedir}/testlib -donkeylib=${donkey}/lib -conf=${basedir}/conf -dbconf=${basedir}/dbconf -public_html=${basedir}/public_html -public_api_html=${basedir}/public_api_html -build=${basedir}/build -extensions=${build}/extensions -logs=${basedir}/logs -docs=${basedir}/docs -docs.javadocs=${docs}/javadocs -docs.javadocs.userapi=${docs.javadocs}/user-api -installer=${basedir}/installer -installer.lib=${installer}/lib -basedir_includes=${basedir}/basedir-includes - -# jars -client-core.jar=mirth-client-core.jar -crypto.jar=mirth-crypto.jar -server.jar=mirth-server.jar -mirth-launcher.jar=mirth-server-launcher.jar -dbconf.jar=mirth-dbconf.jar -userutil-sources.jar=userutil-sources.jar -tests.jar=mirth-server-tests.jar - -# setup directory -setup=${basedir}/setup -setup.server.lib=${setup}/server-lib -setup.server.lib.donkey=${setup}/lib/donkey -setup.server.launcher.lib=${setup}/server-launcher-lib -setup.client.lib=${setup}/client-lib -setup.manager.lib=${setup}/manager-lib -setup.cli.lib=${setup}/cli-lib -setup.conf=${setup}/conf -setup.extensions=${setup}/extensions -setup.public_html=${setup}/public_html -setup.public_api_html=${setup}/public_api_html -setup.logs=${setup}/logs -setup.docs=${setup}/docs - -# dist directory -dist=${basedir}/dist -dist.extensions=${dist}/extensions -test.dist=${basedir}/testdist diff --git a/server/build.xml b/server/build.xml deleted file mode 100644 index 96830a4ece..0000000000 --- a/server/build.xml +++ /dev/null @@ -1,1327 +0,0 @@ - - - - - - - - - - Mirth Connect Build Help - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sub-project files have been copied into setup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/mirth-build.properties b/server/mirth-build.properties deleted file mode 100644 index 411999332f..0000000000 --- a/server/mirth-build.properties +++ /dev/null @@ -1,7 +0,0 @@ -donkey=../donkey -server=../server -client=../client -webadmin=../webadmin -manager=../manager -cli=../command -version=4.5.2 diff --git a/server/mirth-build.xml b/server/mirth-build.xml deleted file mode 100644 index 1b4976042b..0000000000 --- a/server/mirth-build.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application version: ${version} - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- - - - - - - - - - - - - - - - - - -
diff --git a/server/mirth-ci-extensions.xml b/server/mirth-ci-extensions.xml deleted file mode 100644 index a7f52357df..0000000000 --- a/server/mirth-ci-extensions.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/mirth-ci.xml b/server/mirth-ci.xml deleted file mode 100644 index af19cc813e..0000000000 --- a/server/mirth-ci.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/run-eclipse.xml b/server/run-eclipse.xml deleted file mode 100644 index 36e8abaced..0000000000 --- a/server/run-eclipse.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/server-launcher-lib/.keep b/server/server-launcher-lib/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/server/src/com/eviware/soapui/resources/conf/soapui-log4j.xml b/server/src/main/java/com/eviware/soapui/resources/conf/soapui-log4j.xml similarity index 100% rename from server/src/com/eviware/soapui/resources/conf/soapui-log4j.xml rename to server/src/main/java/com/eviware/soapui/resources/conf/soapui-log4j.xml diff --git a/server/src/com/mirth/commons/encryption/Digester.java b/server/src/main/java/com/mirth/commons/encryption/Digester.java similarity index 100% rename from server/src/com/mirth/commons/encryption/Digester.java rename to server/src/main/java/com/mirth/commons/encryption/Digester.java diff --git a/server/src/com/mirth/commons/encryption/EncryptionException.java b/server/src/main/java/com/mirth/commons/encryption/EncryptionException.java similarity index 100% rename from server/src/com/mirth/commons/encryption/EncryptionException.java rename to server/src/main/java/com/mirth/commons/encryption/EncryptionException.java diff --git a/server/src/com/mirth/commons/encryption/Encryptor.java b/server/src/main/java/com/mirth/commons/encryption/Encryptor.java similarity index 100% rename from server/src/com/mirth/commons/encryption/Encryptor.java rename to server/src/main/java/com/mirth/commons/encryption/Encryptor.java diff --git a/server/src/com/mirth/commons/encryption/KeyEncryptor.java b/server/src/main/java/com/mirth/commons/encryption/KeyEncryptor.java similarity index 100% rename from server/src/com/mirth/commons/encryption/KeyEncryptor.java rename to server/src/main/java/com/mirth/commons/encryption/KeyEncryptor.java diff --git a/server/src/com/mirth/commons/encryption/Output.java b/server/src/main/java/com/mirth/commons/encryption/Output.java similarity index 100% rename from server/src/com/mirth/commons/encryption/Output.java rename to server/src/main/java/com/mirth/commons/encryption/Output.java diff --git a/server/src/com/mirth/commons/encryption/PBEEncryptor.java b/server/src/main/java/com/mirth/commons/encryption/PBEEncryptor.java similarity index 100% rename from server/src/com/mirth/commons/encryption/PBEEncryptor.java rename to server/src/main/java/com/mirth/commons/encryption/PBEEncryptor.java diff --git a/server/src/com/mirth/commons/encryption/util/DigestUtil.java b/server/src/main/java/com/mirth/commons/encryption/util/DigestUtil.java similarity index 100% rename from server/src/com/mirth/commons/encryption/util/DigestUtil.java rename to server/src/main/java/com/mirth/commons/encryption/util/DigestUtil.java diff --git a/server/src/com/mirth/commons/encryption/util/EncryptionUtil.java b/server/src/main/java/com/mirth/commons/encryption/util/EncryptionUtil.java similarity index 100% rename from server/src/com/mirth/commons/encryption/util/EncryptionUtil.java rename to server/src/main/java/com/mirth/commons/encryption/util/EncryptionUtil.java diff --git a/server/src/com/mirth/connect/client/core/Client.java b/server/src/main/java/com/mirth/connect/client/core/Client.java similarity index 100% rename from server/src/com/mirth/connect/client/core/Client.java rename to server/src/main/java/com/mirth/connect/client/core/Client.java diff --git a/server/src/com/mirth/connect/client/core/ClientException.java b/server/src/main/java/com/mirth/connect/client/core/ClientException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ClientException.java rename to server/src/main/java/com/mirth/connect/client/core/ClientException.java diff --git a/server/src/com/mirth/connect/client/core/ConnectServiceUtil.java b/server/src/main/java/com/mirth/connect/client/core/ConnectServiceUtil.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ConnectServiceUtil.java rename to server/src/main/java/com/mirth/connect/client/core/ConnectServiceUtil.java diff --git a/server/src/com/mirth/connect/client/core/ControllerException.java b/server/src/main/java/com/mirth/connect/client/core/ControllerException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ControllerException.java rename to server/src/main/java/com/mirth/connect/client/core/ControllerException.java diff --git a/server/src/com/mirth/connect/client/core/EntityException.java b/server/src/main/java/com/mirth/connect/client/core/EntityException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/EntityException.java rename to server/src/main/java/com/mirth/connect/client/core/EntityException.java diff --git a/server/src/com/mirth/connect/client/core/ExtensionOperation.java b/server/src/main/java/com/mirth/connect/client/core/ExtensionOperation.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ExtensionOperation.java rename to server/src/main/java/com/mirth/connect/client/core/ExtensionOperation.java diff --git a/server/src/com/mirth/connect/client/core/ForbiddenException.java b/server/src/main/java/com/mirth/connect/client/core/ForbiddenException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ForbiddenException.java rename to server/src/main/java/com/mirth/connect/client/core/ForbiddenException.java diff --git a/server/src/com/mirth/connect/client/core/IgnoredComponent.java b/server/src/main/java/com/mirth/connect/client/core/IgnoredComponent.java similarity index 100% rename from server/src/com/mirth/connect/client/core/IgnoredComponent.java rename to server/src/main/java/com/mirth/connect/client/core/IgnoredComponent.java diff --git a/server/src/com/mirth/connect/client/core/InvalidLoginException.java b/server/src/main/java/com/mirth/connect/client/core/InvalidLoginException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/InvalidLoginException.java rename to server/src/main/java/com/mirth/connect/client/core/InvalidLoginException.java diff --git a/server/src/com/mirth/connect/client/core/ListHandler.java b/server/src/main/java/com/mirth/connect/client/core/ListHandler.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ListHandler.java rename to server/src/main/java/com/mirth/connect/client/core/ListHandler.java diff --git a/server/src/com/mirth/connect/client/core/ListHandlerException.java b/server/src/main/java/com/mirth/connect/client/core/ListHandlerException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ListHandlerException.java rename to server/src/main/java/com/mirth/connect/client/core/ListHandlerException.java diff --git a/server/src/com/mirth/connect/client/core/MirthClientResponse.java b/server/src/main/java/com/mirth/connect/client/core/MirthClientResponse.java similarity index 100% rename from server/src/com/mirth/connect/client/core/MirthClientResponse.java rename to server/src/main/java/com/mirth/connect/client/core/MirthClientResponse.java diff --git a/server/src/com/mirth/connect/client/core/Operation.java b/server/src/main/java/com/mirth/connect/client/core/Operation.java similarity index 100% rename from server/src/com/mirth/connect/client/core/Operation.java rename to server/src/main/java/com/mirth/connect/client/core/Operation.java diff --git a/server/src/com/mirth/connect/client/core/PaginatedEventList.java b/server/src/main/java/com/mirth/connect/client/core/PaginatedEventList.java similarity index 100% rename from server/src/com/mirth/connect/client/core/PaginatedEventList.java rename to server/src/main/java/com/mirth/connect/client/core/PaginatedEventList.java diff --git a/server/src/com/mirth/connect/client/core/PaginatedMessageList.java b/server/src/main/java/com/mirth/connect/client/core/PaginatedMessageList.java similarity index 100% rename from server/src/com/mirth/connect/client/core/PaginatedMessageList.java rename to server/src/main/java/com/mirth/connect/client/core/PaginatedMessageList.java diff --git a/server/src/com/mirth/connect/client/core/Permissions.java b/server/src/main/java/com/mirth/connect/client/core/Permissions.java similarity index 100% rename from server/src/com/mirth/connect/client/core/Permissions.java rename to server/src/main/java/com/mirth/connect/client/core/Permissions.java diff --git a/server/src/com/mirth/connect/client/core/PropertiesConfigurationUtil.java b/server/src/main/java/com/mirth/connect/client/core/PropertiesConfigurationUtil.java similarity index 100% rename from server/src/com/mirth/connect/client/core/PropertiesConfigurationUtil.java rename to server/src/main/java/com/mirth/connect/client/core/PropertiesConfigurationUtil.java diff --git a/server/src/com/mirth/connect/client/core/RequestAbortedException.java b/server/src/main/java/com/mirth/connect/client/core/RequestAbortedException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/RequestAbortedException.java rename to server/src/main/java/com/mirth/connect/client/core/RequestAbortedException.java diff --git a/server/src/com/mirth/connect/client/core/ServerConnection.java b/server/src/main/java/com/mirth/connect/client/core/ServerConnection.java similarity index 100% rename from server/src/com/mirth/connect/client/core/ServerConnection.java rename to server/src/main/java/com/mirth/connect/client/core/ServerConnection.java diff --git a/server/src/com/mirth/connect/client/core/TaskConstants.java b/server/src/main/java/com/mirth/connect/client/core/TaskConstants.java similarity index 100% rename from server/src/com/mirth/connect/client/core/TaskConstants.java rename to server/src/main/java/com/mirth/connect/client/core/TaskConstants.java diff --git a/server/src/com/mirth/connect/client/core/UnauthorizedException.java b/server/src/main/java/com/mirth/connect/client/core/UnauthorizedException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/UnauthorizedException.java rename to server/src/main/java/com/mirth/connect/client/core/UnauthorizedException.java diff --git a/server/src/com/mirth/connect/client/core/Version.java b/server/src/main/java/com/mirth/connect/client/core/Version.java similarity index 100% rename from server/src/com/mirth/connect/client/core/Version.java rename to server/src/main/java/com/mirth/connect/client/core/Version.java diff --git a/server/src/com/mirth/connect/client/core/VersionMismatchException.java b/server/src/main/java/com/mirth/connect/client/core/VersionMismatchException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/VersionMismatchException.java rename to server/src/main/java/com/mirth/connect/client/core/VersionMismatchException.java diff --git a/server/src/com/mirth/connect/client/core/api/BaseServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/BaseServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/BaseServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/BaseServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/InvocationHandlerRecorder.java b/server/src/main/java/com/mirth/connect/client/core/api/InvocationHandlerRecorder.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/InvocationHandlerRecorder.java rename to server/src/main/java/com/mirth/connect/client/core/api/InvocationHandlerRecorder.java diff --git a/server/src/com/mirth/connect/client/core/api/MirthApiException.java b/server/src/main/java/com/mirth/connect/client/core/api/MirthApiException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/MirthApiException.java rename to server/src/main/java/com/mirth/connect/client/core/api/MirthApiException.java diff --git a/server/src/com/mirth/connect/client/core/api/MirthOperation.java b/server/src/main/java/com/mirth/connect/client/core/api/MirthOperation.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/MirthOperation.java rename to server/src/main/java/com/mirth/connect/client/core/api/MirthOperation.java diff --git a/server/src/com/mirth/connect/client/core/api/Param.java b/server/src/main/java/com/mirth/connect/client/core/api/Param.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/Param.java rename to server/src/main/java/com/mirth/connect/client/core/api/Param.java diff --git a/server/src/com/mirth/connect/client/core/api/PersistenceException.java b/server/src/main/java/com/mirth/connect/client/core/api/PersistenceException.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/PersistenceException.java rename to server/src/main/java/com/mirth/connect/client/core/api/PersistenceException.java diff --git a/server/src/com/mirth/connect/client/core/api/Replaces.java b/server/src/main/java/com/mirth/connect/client/core/api/Replaces.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/Replaces.java rename to server/src/main/java/com/mirth/connect/client/core/api/Replaces.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/CalendarParamConverterProvider.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/CalendarParamConverterProvider.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/CalendarParamConverterProvider.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/CalendarParamConverterProvider.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/JsonMessageBodyReader.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyReader.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/JsonMessageBodyReader.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyReader.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/JsonMessageBodyWriter.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyWriter.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/JsonMessageBodyWriter.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyWriter.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProvider.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProvider.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProvider.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProvider.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/XmlMessageBodyReader.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/XmlMessageBodyReader.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/XmlMessageBodyReader.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/XmlMessageBodyReader.java diff --git a/server/src/com/mirth/connect/client/core/api/providers/XmlMessageBodyWriter.java b/server/src/main/java/com/mirth/connect/client/core/api/providers/XmlMessageBodyWriter.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/providers/XmlMessageBodyWriter.java rename to server/src/main/java/com/mirth/connect/client/core/api/providers/XmlMessageBodyWriter.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/AlertServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/AlertServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/AlertServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/AlertServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ChannelGroupServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelGroupServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ChannelGroupServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelGroupServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ChannelServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ChannelServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ChannelStatisticsServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelStatisticsServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ChannelStatisticsServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelStatisticsServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ChannelStatusServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelStatusServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ChannelStatusServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ChannelStatusServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/CodeTemplateServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/CodeTemplateServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/CodeTemplateServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/CodeTemplateServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/DatabaseTaskServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/DatabaseTaskServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/DatabaseTaskServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/DatabaseTaskServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/EngineServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/EngineServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/EngineServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/EngineServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/EventServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/EventServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/EventServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/EventServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ExtensionServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/ExtensionServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/ExtensionServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/ExtensionServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/MessageServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/SystemServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/SystemServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/SystemServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/SystemServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/UsageServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/UsageServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/UsageServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/UsageServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java b/server/src/main/java/com/mirth/connect/client/core/api/servlets/UserServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java rename to server/src/main/java/com/mirth/connect/client/core/api/servlets/UserServletInterface.java diff --git a/server/src/com/mirth/connect/client/core/api/util/OperationUtil.java b/server/src/main/java/com/mirth/connect/client/core/api/util/OperationUtil.java similarity index 100% rename from server/src/com/mirth/connect/client/core/api/util/OperationUtil.java rename to server/src/main/java/com/mirth/connect/client/core/api/util/OperationUtil.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMConfigurationUtil.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMConfigurationUtil.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMConfigurationUtil.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMConfigurationUtil.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMReceiver.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMReceiver.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DICOMReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/dimse/DefaultDICOMConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/dimse/DefaultDICOMConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/DefaultDICOMConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/dimse/DefaultDICOMConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/dimse/destination.xml b/server/src/main/java/com/mirth/connect/connectors/dimse/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/dimse/destination.xml diff --git a/server/src/com/mirth/connect/connectors/dimse/source.xml b/server/src/main/java/com/mirth/connect/connectors/dimse/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/dimse/source.xml rename to server/src/main/java/com/mirth/connect/connectors/dimse/source.xml diff --git a/server/src/com/mirth/connect/connectors/doc/DocumentConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/doc/DocumentConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/DocumentConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/doc/DocumentConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/doc/DocumentDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/doc/DocumentDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/DocumentDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/doc/DocumentDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/doc/DocumentDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/doc/PageSize.java b/server/src/main/java/com/mirth/connect/connectors/doc/PageSize.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/PageSize.java rename to server/src/main/java/com/mirth/connect/connectors/doc/PageSize.java diff --git a/server/src/com/mirth/connect/connectors/doc/Unit.java b/server/src/main/java/com/mirth/connect/connectors/doc/Unit.java similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/Unit.java rename to server/src/main/java/com/mirth/connect/connectors/doc/Unit.java diff --git a/server/src/com/mirth/connect/connectors/doc/destination.xml b/server/src/main/java/com/mirth/connect/connectors/doc/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/doc/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/doc/destination.xml diff --git a/server/src/com/mirth/connect/connectors/file/DefaultFileConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/file/DefaultFileConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/DefaultFileConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/file/DefaultFileConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/file/FTPSchemeProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/FTPSchemeProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FTPSchemeProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/FTPSchemeProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/FileAction.java b/server/src/main/java/com/mirth/connect/connectors/file/FileAction.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileAction.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileAction.java diff --git a/server/src/com/mirth/connect/connectors/file/FileConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/file/FileConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/file/FileConnector.java b/server/src/main/java/com/mirth/connect/connectors/file/FileConnector.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileConnector.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileConnector.java diff --git a/server/src/com/mirth/connect/connectors/file/FileConnectorException.java b/server/src/main/java/com/mirth/connect/connectors/file/FileConnectorException.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileConnectorException.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileConnectorException.java diff --git a/server/src/com/mirth/connect/connectors/file/FileConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/file/FileConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/file/FileConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/file/FileConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/file/FileDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/file/FileDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/file/FileDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/FileDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/FileReceiver.java b/server/src/main/java/com/mirth/connect/connectors/file/FileReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileReceiver.java diff --git a/server/src/com/mirth/connect/connectors/file/FileReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/FileReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/FileScheme.java b/server/src/main/java/com/mirth/connect/connectors/file/FileScheme.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileScheme.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileScheme.java diff --git a/server/src/com/mirth/connect/connectors/file/FileSystemConnectionOptions.java b/server/src/main/java/com/mirth/connect/connectors/file/FileSystemConnectionOptions.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/FileSystemConnectionOptions.java rename to server/src/main/java/com/mirth/connect/connectors/file/FileSystemConnectionOptions.java diff --git a/server/src/com/mirth/connect/connectors/file/S3SchemeProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/S3SchemeProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/S3SchemeProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/S3SchemeProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/SchemeProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/SchemeProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/SchemeProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/SchemeProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/SftpSchemeProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/SftpSchemeProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/SftpSchemeProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/SftpSchemeProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/SmbDialectVersion.java b/server/src/main/java/com/mirth/connect/connectors/file/SmbDialectVersion.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/SmbDialectVersion.java rename to server/src/main/java/com/mirth/connect/connectors/file/SmbDialectVersion.java diff --git a/server/src/com/mirth/connect/connectors/file/SmbSchemeProperties.java b/server/src/main/java/com/mirth/connect/connectors/file/SmbSchemeProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/SmbSchemeProperties.java rename to server/src/main/java/com/mirth/connect/connectors/file/SmbSchemeProperties.java diff --git a/server/src/com/mirth/connect/connectors/file/destination.xml b/server/src/main/java/com/mirth/connect/connectors/file/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/file/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/file/destination.xml diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FileConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FileConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FileIgnoring.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileIgnoring.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FileIgnoring.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileIgnoring.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FileInfo.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileInfo.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FileInfo.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileInfo.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FileSystemConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FileSystemConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactory.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactory.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactory.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactory.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/FtpConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/FtpConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/FtpConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/FtpConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/HaltableFTPClient.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/HaltableFTPClient.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/HaltableFTPClient.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/HaltableFTPClient.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/S3Connection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/S3Connection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/S3Connection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/S3Connection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/SftpConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/SftpConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/SftpConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/SftpConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/SftpUserInfo.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/SftpUserInfo.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/SftpUserInfo.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/SftpUserInfo.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/SmbFileConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/SmbFileConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/SmbFileConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/SmbFileConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filesystems/WebDavConnection.java b/server/src/main/java/com/mirth/connect/connectors/file/filesystems/WebDavConnection.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filesystems/WebDavConnection.java rename to server/src/main/java/com/mirth/connect/connectors/file/filesystems/WebDavConnection.java diff --git a/server/src/com/mirth/connect/connectors/file/filters/RegexFilenameFilter.java b/server/src/main/java/com/mirth/connect/connectors/file/filters/RegexFilenameFilter.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filters/RegexFilenameFilter.java rename to server/src/main/java/com/mirth/connect/connectors/file/filters/RegexFilenameFilter.java diff --git a/server/src/com/mirth/connect/connectors/file/filters/SmbFilenameWildcardFilter.java b/server/src/main/java/com/mirth/connect/connectors/file/filters/SmbFilenameWildcardFilter.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filters/SmbFilenameWildcardFilter.java rename to server/src/main/java/com/mirth/connect/connectors/file/filters/SmbFilenameWildcardFilter.java diff --git a/server/src/com/mirth/connect/connectors/file/filters/SmbRegexFilenameFilter.java b/server/src/main/java/com/mirth/connect/connectors/file/filters/SmbRegexFilenameFilter.java similarity index 100% rename from server/src/com/mirth/connect/connectors/file/filters/SmbRegexFilenameFilter.java rename to server/src/main/java/com/mirth/connect/connectors/file/filters/SmbRegexFilenameFilter.java diff --git a/server/src/com/mirth/connect/connectors/file/source.xml b/server/src/main/java/com/mirth/connect/connectors/file/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/file/source.xml rename to server/src/main/java/com/mirth/connect/connectors/file/source.xml diff --git a/server/src/com/mirth/connect/connectors/http/BinaryContentTypeResolver.java b/server/src/main/java/com/mirth/connect/connectors/http/BinaryContentTypeResolver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/BinaryContentTypeResolver.java rename to server/src/main/java/com/mirth/connect/connectors/http/BinaryContentTypeResolver.java diff --git a/server/src/com/mirth/connect/connectors/http/DefaultHttpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/http/DefaultHttpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/DefaultHttpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/http/DefaultHttpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpMessageConverter.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpMessageConverter.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpMessageConverter.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpMessageConverter.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpReceiver.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpReceiver.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpRequestMessage.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpRequestMessage.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpRequestMessage.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpRequestMessage.java diff --git a/server/src/com/mirth/connect/connectors/http/HttpStaticResource.java b/server/src/main/java/com/mirth/connect/connectors/http/HttpStaticResource.java similarity index 100% rename from server/src/com/mirth/connect/connectors/http/HttpStaticResource.java rename to server/src/main/java/com/mirth/connect/connectors/http/HttpStaticResource.java diff --git a/server/src/com/mirth/connect/connectors/http/destination.xml b/server/src/main/java/com/mirth/connect/connectors/http/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/http/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/http/destination.xml diff --git a/server/src/com/mirth/connect/connectors/http/source.xml b/server/src/main/java/com/mirth/connect/connectors/http/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/http/source.xml rename to server/src/main/java/com/mirth/connect/connectors/http/source.xml diff --git a/server/src/com/mirth/connect/connectors/jdbc/Column.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/Column.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/Column.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/Column.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/CustomDriver.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/CustomDriver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/CustomDriver.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/CustomDriver.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherDelegate.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherDelegate.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherDelegate.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherDelegate.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherException.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherException.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherException.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherException.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherQuery.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherQuery.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherQuery.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherQuery.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScript.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScript.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScript.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScript.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiver.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiver.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverDelegate.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverDelegate.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverDelegate.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverDelegate.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverException.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverException.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverException.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverException.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverScript.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverScript.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverScript.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverScript.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/JdbcUtils.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/JdbcUtils.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/JdbcUtils.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/JdbcUtils.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/Table.java b/server/src/main/java/com/mirth/connect/connectors/jdbc/Table.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/Table.java rename to server/src/main/java/com/mirth/connect/connectors/jdbc/Table.java diff --git a/server/src/com/mirth/connect/connectors/jdbc/destination.xml b/server/src/main/java/com/mirth/connect/connectors/jdbc/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/jdbc/destination.xml diff --git a/server/src/com/mirth/connect/connectors/jdbc/source.xml b/server/src/main/java/com/mirth/connect/connectors/jdbc/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/jdbc/source.xml rename to server/src/main/java/com/mirth/connect/connectors/jdbc/source.xml diff --git a/server/src/com/mirth/connect/connectors/jms/JmsClient.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsClient.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsClient.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsClient.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsConnectorException.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorException.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsConnectorException.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorException.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsConnectorProperties.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsConnectorProperties.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorProperties.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsReceiver.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsReceiver.java diff --git a/server/src/com/mirth/connect/connectors/jms/JmsReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/jms/JmsReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/JmsReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/jms/JmsReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/jms/destination.xml b/server/src/main/java/com/mirth/connect/connectors/jms/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/jms/destination.xml diff --git a/server/src/com/mirth/connect/connectors/jms/source.xml b/server/src/main/java/com/mirth/connect/connectors/jms/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/jms/source.xml rename to server/src/main/java/com/mirth/connect/connectors/jms/source.xml diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/js/JavaScriptDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/js/JavaScriptDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/js/JavaScriptDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptReceiver.java b/server/src/main/java/com/mirth/connect/connectors/js/JavaScriptReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/js/JavaScriptReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/js/JavaScriptReceiver.java diff --git a/server/src/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/js/JavaScriptReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/js/destination.xml b/server/src/main/java/com/mirth/connect/connectors/js/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/js/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/js/destination.xml diff --git a/server/src/com/mirth/connect/connectors/js/source.xml b/server/src/main/java/com/mirth/connect/connectors/js/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/js/source.xml rename to server/src/main/java/com/mirth/connect/connectors/js/source.xml diff --git a/server/src/com/mirth/connect/connectors/smtp/Attachment.java b/server/src/main/java/com/mirth/connect/connectors/smtp/Attachment.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/Attachment.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/Attachment.java diff --git a/server/src/com/mirth/connect/connectors/smtp/DefaultSmtpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/smtp/DefaultSmtpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/DefaultSmtpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/DefaultSmtpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/SmtpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/SmtpConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/smtp/SmtpDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/SmtpDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/SmtpDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/smtp/destination.xml b/server/src/main/java/com/mirth/connect/connectors/smtp/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/smtp/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/smtp/destination.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/DefaultTcpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/tcp/DefaultTcpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/DefaultTcpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/DefaultTcpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/tcp/SocketUtil.java b/server/src/main/java/com/mirth/connect/connectors/tcp/SocketUtil.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/SocketUtil.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/SocketUtil.java diff --git a/server/src/com/mirth/connect/connectors/tcp/StateAwareServerSocket.java b/server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareServerSocket.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/StateAwareServerSocket.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareServerSocket.java diff --git a/server/src/com/mirth/connect/connectors/tcp/StateAwareSocket.java b/server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareSocket.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/StateAwareSocket.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareSocket.java diff --git a/server/src/com/mirth/connect/connectors/tcp/StateAwareSocketInterface.java b/server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareSocketInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/StateAwareSocketInterface.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/StateAwareSocketInterface.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpReceiver.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpReceiver.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/tcp/TcpServicePlugin.java b/server/src/main/java/com/mirth/connect/connectors/tcp/TcpServicePlugin.java similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/TcpServicePlugin.java rename to server/src/main/java/com/mirth/connect/connectors/tcp/TcpServicePlugin.java diff --git a/server/src/com/mirth/connect/connectors/tcp/destination.xml b/server/src/main/java/com/mirth/connect/connectors/tcp/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/tcp/destination.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/plugin.xml b/server/src/main/java/com/mirth/connect/connectors/tcp/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/plugin.xml rename to server/src/main/java/com/mirth/connect/connectors/tcp/plugin.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/source.xml b/server/src/main/java/com/mirth/connect/connectors/tcp/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/tcp/source.xml rename to server/src/main/java/com/mirth/connect/connectors/tcp/source.xml diff --git a/server/src/com/mirth/connect/connectors/vm/VmDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/vm/VmDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/VmDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/vm/VmDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/vm/VmDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/vm/VmDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/VmDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/vm/VmDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/vm/VmReceiver.java b/server/src/main/java/com/mirth/connect/connectors/vm/VmReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/VmReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/vm/VmReceiver.java diff --git a/server/src/com/mirth/connect/connectors/vm/VmReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/vm/VmReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/VmReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/vm/VmReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/vm/destination.xml b/server/src/main/java/com/mirth/connect/connectors/vm/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/vm/destination.xml diff --git a/server/src/com/mirth/connect/connectors/vm/source.xml b/server/src/main/java/com/mirth/connect/connectors/vm/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/vm/source.xml rename to server/src/main/java/com/mirth/connect/connectors/vm/source.xml diff --git a/server/src/com/mirth/connect/connectors/ws/AcceptMessage.java b/server/src/main/java/com/mirth/connect/connectors/ws/AcceptMessage.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/AcceptMessage.java rename to server/src/main/java/com/mirth/connect/connectors/ws/AcceptMessage.java diff --git a/server/src/com/mirth/connect/connectors/ws/Binding.java b/server/src/main/java/com/mirth/connect/connectors/ws/Binding.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/Binding.java rename to server/src/main/java/com/mirth/connect/connectors/ws/Binding.java diff --git a/server/src/com/mirth/connect/connectors/ws/DefaultAcceptMessage.java b/server/src/main/java/com/mirth/connect/connectors/ws/DefaultAcceptMessage.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/DefaultAcceptMessage.java rename to server/src/main/java/com/mirth/connect/connectors/ws/DefaultAcceptMessage.java diff --git a/server/src/com/mirth/connect/connectors/ws/DefaultWebServiceConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/ws/DefaultWebServiceConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/DefaultWebServiceConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/ws/DefaultWebServiceConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/ws/DefinitionServiceMap.java b/server/src/main/java/com/mirth/connect/connectors/ws/DefinitionServiceMap.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/DefinitionServiceMap.java rename to server/src/main/java/com/mirth/connect/connectors/ws/DefinitionServiceMap.java diff --git a/server/src/com/mirth/connect/connectors/ws/LoggingSOAPHandler.java b/server/src/main/java/com/mirth/connect/connectors/ws/LoggingSOAPHandler.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/LoggingSOAPHandler.java rename to server/src/main/java/com/mirth/connect/connectors/ws/LoggingSOAPHandler.java diff --git a/server/src/com/mirth/connect/connectors/ws/SSLSocketFactoryWrapper.java b/server/src/main/java/com/mirth/connect/connectors/ws/SSLSocketFactoryWrapper.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/SSLSocketFactoryWrapper.java rename to server/src/main/java/com/mirth/connect/connectors/ws/SSLSocketFactoryWrapper.java diff --git a/server/src/com/mirth/connect/connectors/ws/SchemaType.java b/server/src/main/java/com/mirth/connect/connectors/ws/SchemaType.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/SchemaType.java rename to server/src/main/java/com/mirth/connect/connectors/ws/SchemaType.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceConfiguration.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceConfiguration.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConfiguration.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceConnectorServlet.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConnectorServlet.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceConnectorServlet.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConnectorServlet.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceDispatcher.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceDispatcher.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceDispatcher.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceDispatcher.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceReceiver.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceReceiver.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceReceiver.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceReceiver.java diff --git a/server/src/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java b/server/src/main/java/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java rename to server/src/main/java/com/mirth/connect/connectors/ws/WebServiceReceiverProperties.java diff --git a/server/src/com/mirth/connect/connectors/ws/destination.xml b/server/src/main/java/com/mirth/connect/connectors/ws/destination.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/destination.xml rename to server/src/main/java/com/mirth/connect/connectors/ws/destination.xml diff --git a/server/src/com/mirth/connect/connectors/ws/source.xml b/server/src/main/java/com/mirth/connect/connectors/ws/source.xml similarity index 100% rename from server/src/com/mirth/connect/connectors/ws/source.xml rename to server/src/main/java/com/mirth/connect/connectors/ws/source.xml diff --git a/server/src/com/mirth/connect/model/AbstractSettings.java b/server/src/main/java/com/mirth/connect/model/AbstractSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/AbstractSettings.java rename to server/src/main/java/com/mirth/connect/model/AbstractSettings.java diff --git a/server/src/com/mirth/connect/model/ApiProvider.java b/server/src/main/java/com/mirth/connect/model/ApiProvider.java similarity index 100% rename from server/src/com/mirth/connect/model/ApiProvider.java rename to server/src/main/java/com/mirth/connect/model/ApiProvider.java diff --git a/server/src/com/mirth/connect/model/ArchiveMetaData.java b/server/src/main/java/com/mirth/connect/model/ArchiveMetaData.java similarity index 100% rename from server/src/com/mirth/connect/model/ArchiveMetaData.java rename to server/src/main/java/com/mirth/connect/model/ArchiveMetaData.java diff --git a/server/src/com/mirth/connect/model/Auditable.java b/server/src/main/java/com/mirth/connect/model/Auditable.java similarity index 100% rename from server/src/com/mirth/connect/model/Auditable.java rename to server/src/main/java/com/mirth/connect/model/Auditable.java diff --git a/server/src/com/mirth/connect/model/Cacheable.java b/server/src/main/java/com/mirth/connect/model/Cacheable.java similarity index 100% rename from server/src/com/mirth/connect/model/Cacheable.java rename to server/src/main/java/com/mirth/connect/model/Cacheable.java diff --git a/server/src/com/mirth/connect/model/CalendarToStringStyle.java b/server/src/main/java/com/mirth/connect/model/CalendarToStringStyle.java similarity index 100% rename from server/src/com/mirth/connect/model/CalendarToStringStyle.java rename to server/src/main/java/com/mirth/connect/model/CalendarToStringStyle.java diff --git a/server/src/com/mirth/connect/model/Channel.java b/server/src/main/java/com/mirth/connect/model/Channel.java similarity index 100% rename from server/src/com/mirth/connect/model/Channel.java rename to server/src/main/java/com/mirth/connect/model/Channel.java diff --git a/server/src/com/mirth/connect/model/ChannelDependency.java b/server/src/main/java/com/mirth/connect/model/ChannelDependency.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelDependency.java rename to server/src/main/java/com/mirth/connect/model/ChannelDependency.java diff --git a/server/src/com/mirth/connect/model/ChannelExportData.java b/server/src/main/java/com/mirth/connect/model/ChannelExportData.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelExportData.java rename to server/src/main/java/com/mirth/connect/model/ChannelExportData.java diff --git a/server/src/com/mirth/connect/model/ChannelGroup.java b/server/src/main/java/com/mirth/connect/model/ChannelGroup.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelGroup.java rename to server/src/main/java/com/mirth/connect/model/ChannelGroup.java diff --git a/server/src/com/mirth/connect/model/ChannelHeader.java b/server/src/main/java/com/mirth/connect/model/ChannelHeader.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelHeader.java rename to server/src/main/java/com/mirth/connect/model/ChannelHeader.java diff --git a/server/src/com/mirth/connect/model/ChannelMetadata.java b/server/src/main/java/com/mirth/connect/model/ChannelMetadata.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelMetadata.java rename to server/src/main/java/com/mirth/connect/model/ChannelMetadata.java diff --git a/server/src/com/mirth/connect/model/ChannelProperties.java b/server/src/main/java/com/mirth/connect/model/ChannelProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelProperties.java rename to server/src/main/java/com/mirth/connect/model/ChannelProperties.java diff --git a/server/src/com/mirth/connect/model/ChannelPruningSettings.java b/server/src/main/java/com/mirth/connect/model/ChannelPruningSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelPruningSettings.java rename to server/src/main/java/com/mirth/connect/model/ChannelPruningSettings.java diff --git a/server/src/com/mirth/connect/model/ChannelStatistics.java b/server/src/main/java/com/mirth/connect/model/ChannelStatistics.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelStatistics.java rename to server/src/main/java/com/mirth/connect/model/ChannelStatistics.java diff --git a/server/src/com/mirth/connect/model/ChannelStatus.java b/server/src/main/java/com/mirth/connect/model/ChannelStatus.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelStatus.java rename to server/src/main/java/com/mirth/connect/model/ChannelStatus.java diff --git a/server/src/com/mirth/connect/model/ChannelSummary.java b/server/src/main/java/com/mirth/connect/model/ChannelSummary.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelSummary.java rename to server/src/main/java/com/mirth/connect/model/ChannelSummary.java diff --git a/server/src/com/mirth/connect/model/ChannelTag.java b/server/src/main/java/com/mirth/connect/model/ChannelTag.java similarity index 100% rename from server/src/com/mirth/connect/model/ChannelTag.java rename to server/src/main/java/com/mirth/connect/model/ChannelTag.java diff --git a/server/src/com/mirth/connect/model/Connector.java b/server/src/main/java/com/mirth/connect/model/Connector.java similarity index 100% rename from server/src/com/mirth/connect/model/Connector.java rename to server/src/main/java/com/mirth/connect/model/Connector.java diff --git a/server/src/com/mirth/connect/model/ConnectorMetaData.java b/server/src/main/java/com/mirth/connect/model/ConnectorMetaData.java similarity index 100% rename from server/src/com/mirth/connect/model/ConnectorMetaData.java rename to server/src/main/java/com/mirth/connect/model/ConnectorMetaData.java diff --git a/server/src/com/mirth/connect/model/Credentials.java b/server/src/main/java/com/mirth/connect/model/Credentials.java similarity index 100% rename from server/src/com/mirth/connect/model/Credentials.java rename to server/src/main/java/com/mirth/connect/model/Credentials.java diff --git a/server/src/com/mirth/connect/model/DashboardChannelInfo.java b/server/src/main/java/com/mirth/connect/model/DashboardChannelInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/DashboardChannelInfo.java rename to server/src/main/java/com/mirth/connect/model/DashboardChannelInfo.java diff --git a/server/src/com/mirth/connect/model/DashboardStatus.java b/server/src/main/java/com/mirth/connect/model/DashboardStatus.java similarity index 100% rename from server/src/com/mirth/connect/model/DashboardStatus.java rename to server/src/main/java/com/mirth/connect/model/DashboardStatus.java diff --git a/server/src/com/mirth/connect/model/DatabaseSettings.java b/server/src/main/java/com/mirth/connect/model/DatabaseSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/DatabaseSettings.java rename to server/src/main/java/com/mirth/connect/model/DatabaseSettings.java diff --git a/server/src/com/mirth/connect/model/DatabaseTask.java b/server/src/main/java/com/mirth/connect/model/DatabaseTask.java similarity index 100% rename from server/src/com/mirth/connect/model/DatabaseTask.java rename to server/src/main/java/com/mirth/connect/model/DatabaseTask.java diff --git a/server/src/com/mirth/connect/model/DebugUsage.java b/server/src/main/java/com/mirth/connect/model/DebugUsage.java similarity index 100% rename from server/src/com/mirth/connect/model/DebugUsage.java rename to server/src/main/java/com/mirth/connect/model/DebugUsage.java diff --git a/server/src/com/mirth/connect/model/DeployedChannelInfo.java b/server/src/main/java/com/mirth/connect/model/DeployedChannelInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/DeployedChannelInfo.java rename to server/src/main/java/com/mirth/connect/model/DeployedChannelInfo.java diff --git a/server/src/com/mirth/connect/model/DriverInfo.java b/server/src/main/java/com/mirth/connect/model/DriverInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/DriverInfo.java rename to server/src/main/java/com/mirth/connect/model/DriverInfo.java diff --git a/server/src/com/mirth/connect/model/EncryptionSettings.java b/server/src/main/java/com/mirth/connect/model/EncryptionSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/EncryptionSettings.java rename to server/src/main/java/com/mirth/connect/model/EncryptionSettings.java diff --git a/server/src/com/mirth/connect/model/ExportClearable.java b/server/src/main/java/com/mirth/connect/model/ExportClearable.java similarity index 100% rename from server/src/com/mirth/connect/model/ExportClearable.java rename to server/src/main/java/com/mirth/connect/model/ExportClearable.java diff --git a/server/src/com/mirth/connect/model/Exportable.java b/server/src/main/java/com/mirth/connect/model/Exportable.java similarity index 100% rename from server/src/com/mirth/connect/model/Exportable.java rename to server/src/main/java/com/mirth/connect/model/Exportable.java diff --git a/server/src/com/mirth/connect/model/ExtendedLoginStatus.java b/server/src/main/java/com/mirth/connect/model/ExtendedLoginStatus.java similarity index 100% rename from server/src/com/mirth/connect/model/ExtendedLoginStatus.java rename to server/src/main/java/com/mirth/connect/model/ExtendedLoginStatus.java diff --git a/server/src/com/mirth/connect/model/ExtensionLibrary.java b/server/src/main/java/com/mirth/connect/model/ExtensionLibrary.java similarity index 100% rename from server/src/com/mirth/connect/model/ExtensionLibrary.java rename to server/src/main/java/com/mirth/connect/model/ExtensionLibrary.java diff --git a/server/src/com/mirth/connect/model/ExtensionPermission.java b/server/src/main/java/com/mirth/connect/model/ExtensionPermission.java similarity index 100% rename from server/src/com/mirth/connect/model/ExtensionPermission.java rename to server/src/main/java/com/mirth/connect/model/ExtensionPermission.java diff --git a/server/src/com/mirth/connect/model/Filter.java b/server/src/main/java/com/mirth/connect/model/Filter.java similarity index 100% rename from server/src/com/mirth/connect/model/Filter.java rename to server/src/main/java/com/mirth/connect/model/Filter.java diff --git a/server/src/com/mirth/connect/model/FilterTransformer.java b/server/src/main/java/com/mirth/connect/model/FilterTransformer.java similarity index 100% rename from server/src/com/mirth/connect/model/FilterTransformer.java rename to server/src/main/java/com/mirth/connect/model/FilterTransformer.java diff --git a/server/src/com/mirth/connect/model/FilterTransformerElement.java b/server/src/main/java/com/mirth/connect/model/FilterTransformerElement.java similarity index 100% rename from server/src/com/mirth/connect/model/FilterTransformerElement.java rename to server/src/main/java/com/mirth/connect/model/FilterTransformerElement.java diff --git a/server/src/com/mirth/connect/model/FilterTransformerIterable.java b/server/src/main/java/com/mirth/connect/model/FilterTransformerIterable.java similarity index 100% rename from server/src/com/mirth/connect/model/FilterTransformerIterable.java rename to server/src/main/java/com/mirth/connect/model/FilterTransformerIterable.java diff --git a/server/src/com/mirth/connect/model/InvalidChannel.java b/server/src/main/java/com/mirth/connect/model/InvalidChannel.java similarity index 100% rename from server/src/com/mirth/connect/model/InvalidChannel.java rename to server/src/main/java/com/mirth/connect/model/InvalidChannel.java diff --git a/server/src/com/mirth/connect/model/InvalidConnectorPluginProperties.java b/server/src/main/java/com/mirth/connect/model/InvalidConnectorPluginProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/InvalidConnectorPluginProperties.java rename to server/src/main/java/com/mirth/connect/model/InvalidConnectorPluginProperties.java diff --git a/server/src/com/mirth/connect/model/InvalidResourceProperties.java b/server/src/main/java/com/mirth/connect/model/InvalidResourceProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/InvalidResourceProperties.java rename to server/src/main/java/com/mirth/connect/model/InvalidResourceProperties.java diff --git a/server/src/com/mirth/connect/model/InvalidThrowable.java b/server/src/main/java/com/mirth/connect/model/InvalidThrowable.java similarity index 100% rename from server/src/com/mirth/connect/model/InvalidThrowable.java rename to server/src/main/java/com/mirth/connect/model/InvalidThrowable.java diff --git a/server/src/com/mirth/connect/model/IteratorElement.java b/server/src/main/java/com/mirth/connect/model/IteratorElement.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorElement.java rename to server/src/main/java/com/mirth/connect/model/IteratorElement.java diff --git a/server/src/com/mirth/connect/model/IteratorProperties.java b/server/src/main/java/com/mirth/connect/model/IteratorProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorProperties.java rename to server/src/main/java/com/mirth/connect/model/IteratorProperties.java diff --git a/server/src/com/mirth/connect/model/IteratorRule.java b/server/src/main/java/com/mirth/connect/model/IteratorRule.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorRule.java rename to server/src/main/java/com/mirth/connect/model/IteratorRule.java diff --git a/server/src/com/mirth/connect/model/IteratorRuleProperties.java b/server/src/main/java/com/mirth/connect/model/IteratorRuleProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorRuleProperties.java rename to server/src/main/java/com/mirth/connect/model/IteratorRuleProperties.java diff --git a/server/src/com/mirth/connect/model/IteratorStep.java b/server/src/main/java/com/mirth/connect/model/IteratorStep.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorStep.java rename to server/src/main/java/com/mirth/connect/model/IteratorStep.java diff --git a/server/src/com/mirth/connect/model/IteratorStepProperties.java b/server/src/main/java/com/mirth/connect/model/IteratorStepProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/IteratorStepProperties.java rename to server/src/main/java/com/mirth/connect/model/IteratorStepProperties.java diff --git a/server/src/com/mirth/connect/model/LibraryProperties.java b/server/src/main/java/com/mirth/connect/model/LibraryProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/LibraryProperties.java rename to server/src/main/java/com/mirth/connect/model/LibraryProperties.java diff --git a/server/src/com/mirth/connect/model/LicenseInfo.java b/server/src/main/java/com/mirth/connect/model/LicenseInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/LicenseInfo.java rename to server/src/main/java/com/mirth/connect/model/LicenseInfo.java diff --git a/server/src/com/mirth/connect/model/LoginStatus.java b/server/src/main/java/com/mirth/connect/model/LoginStatus.java similarity index 100% rename from server/src/com/mirth/connect/model/LoginStatus.java rename to server/src/main/java/com/mirth/connect/model/LoginStatus.java diff --git a/server/src/com/mirth/connect/model/LoginStrike.java b/server/src/main/java/com/mirth/connect/model/LoginStrike.java similarity index 100% rename from server/src/com/mirth/connect/model/LoginStrike.java rename to server/src/main/java/com/mirth/connect/model/LoginStrike.java diff --git a/server/src/com/mirth/connect/model/MessageFilterToStringStyle.java b/server/src/main/java/com/mirth/connect/model/MessageFilterToStringStyle.java similarity index 100% rename from server/src/com/mirth/connect/model/MessageFilterToStringStyle.java rename to server/src/main/java/com/mirth/connect/model/MessageFilterToStringStyle.java diff --git a/server/src/com/mirth/connect/model/MessageImportResult.java b/server/src/main/java/com/mirth/connect/model/MessageImportResult.java similarity index 100% rename from server/src/com/mirth/connect/model/MessageImportResult.java rename to server/src/main/java/com/mirth/connect/model/MessageImportResult.java diff --git a/server/src/com/mirth/connect/model/MessageStorageMode.java b/server/src/main/java/com/mirth/connect/model/MessageStorageMode.java similarity index 100% rename from server/src/com/mirth/connect/model/MessageStorageMode.java rename to server/src/main/java/com/mirth/connect/model/MessageStorageMode.java diff --git a/server/src/com/mirth/connect/model/MetaData.java b/server/src/main/java/com/mirth/connect/model/MetaData.java similarity index 100% rename from server/src/com/mirth/connect/model/MetaData.java rename to server/src/main/java/com/mirth/connect/model/MetaData.java diff --git a/server/src/com/mirth/connect/model/MetaDataSearchElementToStringStyle.java b/server/src/main/java/com/mirth/connect/model/MetaDataSearchElementToStringStyle.java similarity index 100% rename from server/src/com/mirth/connect/model/MetaDataSearchElementToStringStyle.java rename to server/src/main/java/com/mirth/connect/model/MetaDataSearchElementToStringStyle.java diff --git a/server/src/com/mirth/connect/model/Parameter.java b/server/src/main/java/com/mirth/connect/model/Parameter.java similarity index 100% rename from server/src/com/mirth/connect/model/Parameter.java rename to server/src/main/java/com/mirth/connect/model/Parameter.java diff --git a/server/src/com/mirth/connect/model/Parameters.java b/server/src/main/java/com/mirth/connect/model/Parameters.java similarity index 100% rename from server/src/com/mirth/connect/model/Parameters.java rename to server/src/main/java/com/mirth/connect/model/Parameters.java diff --git a/server/src/com/mirth/connect/model/PasswordRequirements.java b/server/src/main/java/com/mirth/connect/model/PasswordRequirements.java similarity index 100% rename from server/src/com/mirth/connect/model/PasswordRequirements.java rename to server/src/main/java/com/mirth/connect/model/PasswordRequirements.java diff --git a/server/src/com/mirth/connect/model/PluginClass.java b/server/src/main/java/com/mirth/connect/model/PluginClass.java similarity index 100% rename from server/src/com/mirth/connect/model/PluginClass.java rename to server/src/main/java/com/mirth/connect/model/PluginClass.java diff --git a/server/src/com/mirth/connect/model/PluginClassCondition.java b/server/src/main/java/com/mirth/connect/model/PluginClassCondition.java similarity index 100% rename from server/src/com/mirth/connect/model/PluginClassCondition.java rename to server/src/main/java/com/mirth/connect/model/PluginClassCondition.java diff --git a/server/src/com/mirth/connect/model/PluginMetaData.java b/server/src/main/java/com/mirth/connect/model/PluginMetaData.java similarity index 100% rename from server/src/com/mirth/connect/model/PluginMetaData.java rename to server/src/main/java/com/mirth/connect/model/PluginMetaData.java diff --git a/server/src/com/mirth/connect/model/PublicServerSettings.java b/server/src/main/java/com/mirth/connect/model/PublicServerSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/PublicServerSettings.java rename to server/src/main/java/com/mirth/connect/model/PublicServerSettings.java diff --git a/server/src/com/mirth/connect/model/ResourceProperties.java b/server/src/main/java/com/mirth/connect/model/ResourceProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/ResourceProperties.java rename to server/src/main/java/com/mirth/connect/model/ResourceProperties.java diff --git a/server/src/com/mirth/connect/model/ResourcePropertiesList.java b/server/src/main/java/com/mirth/connect/model/ResourcePropertiesList.java similarity index 100% rename from server/src/com/mirth/connect/model/ResourcePropertiesList.java rename to server/src/main/java/com/mirth/connect/model/ResourcePropertiesList.java diff --git a/server/src/com/mirth/connect/model/Rule.java b/server/src/main/java/com/mirth/connect/model/Rule.java similarity index 100% rename from server/src/com/mirth/connect/model/Rule.java rename to server/src/main/java/com/mirth/connect/model/Rule.java diff --git a/server/src/com/mirth/connect/model/ServerConfiguration.java b/server/src/main/java/com/mirth/connect/model/ServerConfiguration.java similarity index 100% rename from server/src/com/mirth/connect/model/ServerConfiguration.java rename to server/src/main/java/com/mirth/connect/model/ServerConfiguration.java diff --git a/server/src/com/mirth/connect/model/ServerEvent.java b/server/src/main/java/com/mirth/connect/model/ServerEvent.java similarity index 100% rename from server/src/com/mirth/connect/model/ServerEvent.java rename to server/src/main/java/com/mirth/connect/model/ServerEvent.java diff --git a/server/src/com/mirth/connect/model/ServerEventContext.java b/server/src/main/java/com/mirth/connect/model/ServerEventContext.java similarity index 100% rename from server/src/com/mirth/connect/model/ServerEventContext.java rename to server/src/main/java/com/mirth/connect/model/ServerEventContext.java diff --git a/server/src/com/mirth/connect/model/ServerSettings.java b/server/src/main/java/com/mirth/connect/model/ServerSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/ServerSettings.java rename to server/src/main/java/com/mirth/connect/model/ServerSettings.java diff --git a/server/src/com/mirth/connect/model/Step.java b/server/src/main/java/com/mirth/connect/model/Step.java similarity index 100% rename from server/src/com/mirth/connect/model/Step.java rename to server/src/main/java/com/mirth/connect/model/Step.java diff --git a/server/src/com/mirth/connect/model/SystemInfo.java b/server/src/main/java/com/mirth/connect/model/SystemInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/SystemInfo.java rename to server/src/main/java/com/mirth/connect/model/SystemInfo.java diff --git a/server/src/com/mirth/connect/model/SystemStats.java b/server/src/main/java/com/mirth/connect/model/SystemStats.java similarity index 100% rename from server/src/com/mirth/connect/model/SystemStats.java rename to server/src/main/java/com/mirth/connect/model/SystemStats.java diff --git a/server/src/com/mirth/connect/model/Transformer.java b/server/src/main/java/com/mirth/connect/model/Transformer.java similarity index 100% rename from server/src/com/mirth/connect/model/Transformer.java rename to server/src/main/java/com/mirth/connect/model/Transformer.java diff --git a/server/src/com/mirth/connect/model/UpdateSettings.java b/server/src/main/java/com/mirth/connect/model/UpdateSettings.java similarity index 100% rename from server/src/com/mirth/connect/model/UpdateSettings.java rename to server/src/main/java/com/mirth/connect/model/UpdateSettings.java diff --git a/server/src/com/mirth/connect/model/User.java b/server/src/main/java/com/mirth/connect/model/User.java similarity index 100% rename from server/src/com/mirth/connect/model/User.java rename to server/src/main/java/com/mirth/connect/model/User.java diff --git a/server/src/com/mirth/connect/model/alert/AlertAction.java b/server/src/main/java/com/mirth/connect/model/alert/AlertAction.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertAction.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertAction.java diff --git a/server/src/com/mirth/connect/model/alert/AlertActionGroup.java b/server/src/main/java/com/mirth/connect/model/alert/AlertActionGroup.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertActionGroup.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertActionGroup.java diff --git a/server/src/com/mirth/connect/model/alert/AlertChannels.java b/server/src/main/java/com/mirth/connect/model/alert/AlertChannels.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertChannels.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertChannels.java diff --git a/server/src/com/mirth/connect/model/alert/AlertConnectors.java b/server/src/main/java/com/mirth/connect/model/alert/AlertConnectors.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertConnectors.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertConnectors.java diff --git a/server/src/com/mirth/connect/model/alert/AlertInfo.java b/server/src/main/java/com/mirth/connect/model/alert/AlertInfo.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertInfo.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertInfo.java diff --git a/server/src/com/mirth/connect/model/alert/AlertModel.java b/server/src/main/java/com/mirth/connect/model/alert/AlertModel.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertModel.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertModel.java diff --git a/server/src/com/mirth/connect/model/alert/AlertStatus.java b/server/src/main/java/com/mirth/connect/model/alert/AlertStatus.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertStatus.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertStatus.java diff --git a/server/src/com/mirth/connect/model/alert/AlertTrigger.java b/server/src/main/java/com/mirth/connect/model/alert/AlertTrigger.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/AlertTrigger.java rename to server/src/main/java/com/mirth/connect/model/alert/AlertTrigger.java diff --git a/server/src/com/mirth/connect/model/alert/ChannelTrigger.java b/server/src/main/java/com/mirth/connect/model/alert/ChannelTrigger.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/ChannelTrigger.java rename to server/src/main/java/com/mirth/connect/model/alert/ChannelTrigger.java diff --git a/server/src/com/mirth/connect/model/alert/DefaultTrigger.java b/server/src/main/java/com/mirth/connect/model/alert/DefaultTrigger.java similarity index 100% rename from server/src/com/mirth/connect/model/alert/DefaultTrigger.java rename to server/src/main/java/com/mirth/connect/model/alert/DefaultTrigger.java diff --git a/server/src/com/mirth/connect/model/attachments/AttachmentHandlerType.java b/server/src/main/java/com/mirth/connect/model/attachments/AttachmentHandlerType.java similarity index 100% rename from server/src/com/mirth/connect/model/attachments/AttachmentHandlerType.java rename to server/src/main/java/com/mirth/connect/model/attachments/AttachmentHandlerType.java diff --git a/server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java b/server/src/main/java/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/BasicCodeTemplateProperties.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplate.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplate.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplate.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateContextSet.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateFunctionDefinition.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateFunctionDefinition.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateFunctionDefinition.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateFunctionDefinition.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateLibrary.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrarySaveResult.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateLibrarySaveResult.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateLibrarySaveResult.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateLibrarySaveResult.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateProperties.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateProperties.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateProperties.java diff --git a/server/src/com/mirth/connect/model/codetemplates/CodeTemplateSummary.java b/server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateSummary.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/CodeTemplateSummary.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/CodeTemplateSummary.java diff --git a/server/src/com/mirth/connect/model/codetemplates/ContextType.java b/server/src/main/java/com/mirth/connect/model/codetemplates/ContextType.java similarity index 100% rename from server/src/com/mirth/connect/model/codetemplates/ContextType.java rename to server/src/main/java/com/mirth/connect/model/codetemplates/ContextType.java diff --git a/server/src/com/mirth/connect/model/converters/ChannelConverter.java b/server/src/main/java/com/mirth/connect/model/converters/ChannelConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/ChannelConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/ChannelConverter.java diff --git a/server/src/com/mirth/connect/model/converters/DICOMConverter.java b/server/src/main/java/com/mirth/connect/model/converters/DICOMConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/DICOMConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/DICOMConverter.java diff --git a/server/src/com/mirth/connect/model/converters/DocumentSerializer.java b/server/src/main/java/com/mirth/connect/model/converters/DocumentSerializer.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/DocumentSerializer.java rename to server/src/main/java/com/mirth/connect/model/converters/DocumentSerializer.java diff --git a/server/src/com/mirth/connect/model/converters/FilterTransformerElementsConverter.java b/server/src/main/java/com/mirth/connect/model/converters/FilterTransformerElementsConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/FilterTransformerElementsConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/FilterTransformerElementsConverter.java diff --git a/server/src/com/mirth/connect/model/converters/IMessageSerializer.java b/server/src/main/java/com/mirth/connect/model/converters/IMessageSerializer.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/IMessageSerializer.java rename to server/src/main/java/com/mirth/connect/model/converters/IMessageSerializer.java diff --git a/server/src/com/mirth/connect/model/converters/JavaScriptObjectConverter.java b/server/src/main/java/com/mirth/connect/model/converters/JavaScriptObjectConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/JavaScriptObjectConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/JavaScriptObjectConverter.java diff --git a/server/src/com/mirth/connect/model/converters/MapContentConverter.java b/server/src/main/java/com/mirth/connect/model/converters/MapContentConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/MapContentConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/MapContentConverter.java diff --git a/server/src/com/mirth/connect/model/converters/MigratableConverter.java b/server/src/main/java/com/mirth/connect/model/converters/MigratableConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/MigratableConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/MigratableConverter.java diff --git a/server/src/com/mirth/connect/model/converters/MirthDomReader.java b/server/src/main/java/com/mirth/connect/model/converters/MirthDomReader.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/MirthDomReader.java rename to server/src/main/java/com/mirth/connect/model/converters/MirthDomReader.java diff --git a/server/src/com/mirth/connect/model/converters/MirthMapperWrapper.java b/server/src/main/java/com/mirth/connect/model/converters/MirthMapperWrapper.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/MirthMapperWrapper.java rename to server/src/main/java/com/mirth/connect/model/converters/MirthMapperWrapper.java diff --git a/server/src/com/mirth/connect/model/converters/ObjectJSONSerializer.java b/server/src/main/java/com/mirth/connect/model/converters/ObjectJSONSerializer.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/ObjectJSONSerializer.java rename to server/src/main/java/com/mirth/connect/model/converters/ObjectJSONSerializer.java diff --git a/server/src/com/mirth/connect/model/converters/ObjectXMLSerializer.java b/server/src/main/java/com/mirth/connect/model/converters/ObjectXMLSerializer.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/ObjectXMLSerializer.java rename to server/src/main/java/com/mirth/connect/model/converters/ObjectXMLSerializer.java diff --git a/server/src/com/mirth/connect/model/converters/PluginMetaDataConverter.java b/server/src/main/java/com/mirth/connect/model/converters/PluginMetaDataConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/PluginMetaDataConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/PluginMetaDataConverter.java diff --git a/server/src/com/mirth/connect/model/converters/PluginPropertiesConverter.java b/server/src/main/java/com/mirth/connect/model/converters/PluginPropertiesConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/PluginPropertiesConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/PluginPropertiesConverter.java diff --git a/server/src/com/mirth/connect/model/converters/ResourcePropertiesConverter.java b/server/src/main/java/com/mirth/connect/model/converters/ResourcePropertiesConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/ResourcePropertiesConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/ResourcePropertiesConverter.java diff --git a/server/src/com/mirth/connect/model/converters/SerializableReflectionConverter.java b/server/src/main/java/com/mirth/connect/model/converters/SerializableReflectionConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/SerializableReflectionConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/SerializableReflectionConverter.java diff --git a/server/src/com/mirth/connect/model/converters/ThrowableConverter.java b/server/src/main/java/com/mirth/connect/model/converters/ThrowableConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/ThrowableConverter.java rename to server/src/main/java/com/mirth/connect/model/converters/ThrowableConverter.java diff --git a/server/src/com/mirth/connect/model/converters/XMLPrettyPrinter.java b/server/src/main/java/com/mirth/connect/model/converters/XMLPrettyPrinter.java similarity index 100% rename from server/src/com/mirth/connect/model/converters/XMLPrettyPrinter.java rename to server/src/main/java/com/mirth/connect/model/converters/XMLPrettyPrinter.java diff --git a/server/src/com/mirth/connect/model/datatype/BatchProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/BatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/BatchProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/BatchProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/DataTypeDelegate.java b/server/src/main/java/com/mirth/connect/model/datatype/DataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/DataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/model/datatype/DataTypeDelegate.java diff --git a/server/src/com/mirth/connect/model/datatype/DataTypeProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/DataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/DataTypeProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/DataTypeProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/DataTypePropertiesGroup.java b/server/src/main/java/com/mirth/connect/model/datatype/DataTypePropertiesGroup.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/DataTypePropertiesGroup.java rename to server/src/main/java/com/mirth/connect/model/datatype/DataTypePropertiesGroup.java diff --git a/server/src/com/mirth/connect/model/datatype/DataTypePropertyDescriptor.java b/server/src/main/java/com/mirth/connect/model/datatype/DataTypePropertyDescriptor.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/DataTypePropertyDescriptor.java rename to server/src/main/java/com/mirth/connect/model/datatype/DataTypePropertyDescriptor.java diff --git a/server/src/com/mirth/connect/model/datatype/DeserializationProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/DeserializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/DeserializationProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/DeserializationProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/PropertyEditorType.java b/server/src/main/java/com/mirth/connect/model/datatype/PropertyEditorType.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/PropertyEditorType.java rename to server/src/main/java/com/mirth/connect/model/datatype/PropertyEditorType.java diff --git a/server/src/com/mirth/connect/model/datatype/ResponseGenerationProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/ResponseGenerationProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/ResponseGenerationProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/ResponseGenerationProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/ResponseValidationProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/ResponseValidationProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/ResponseValidationProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/ResponseValidationProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/SerializationProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/SerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/SerializationProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/SerializationProperties.java diff --git a/server/src/com/mirth/connect/model/datatype/SerializerProperties.java b/server/src/main/java/com/mirth/connect/model/datatype/SerializerProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/datatype/SerializerProperties.java rename to server/src/main/java/com/mirth/connect/model/datatype/SerializerProperties.java diff --git a/server/src/com/mirth/connect/model/filter/ChannelNameSearchFilter.java b/server/src/main/java/com/mirth/connect/model/filter/ChannelNameSearchFilter.java similarity index 100% rename from server/src/com/mirth/connect/model/filter/ChannelNameSearchFilter.java rename to server/src/main/java/com/mirth/connect/model/filter/ChannelNameSearchFilter.java diff --git a/server/src/com/mirth/connect/model/filter/ChannelTagSearchFilter.java b/server/src/main/java/com/mirth/connect/model/filter/ChannelTagSearchFilter.java similarity index 100% rename from server/src/com/mirth/connect/model/filter/ChannelTagSearchFilter.java rename to server/src/main/java/com/mirth/connect/model/filter/ChannelTagSearchFilter.java diff --git a/server/src/com/mirth/connect/model/filter/SearchFilter.java b/server/src/main/java/com/mirth/connect/model/filter/SearchFilter.java similarity index 100% rename from server/src/com/mirth/connect/model/filter/SearchFilter.java rename to server/src/main/java/com/mirth/connect/model/filter/SearchFilter.java diff --git a/server/src/com/mirth/connect/model/filter/SearchFilterParser.java b/server/src/main/java/com/mirth/connect/model/filter/SearchFilterParser.java similarity index 100% rename from server/src/com/mirth/connect/model/filter/SearchFilterParser.java rename to server/src/main/java/com/mirth/connect/model/filter/SearchFilterParser.java diff --git a/server/src/com/mirth/connect/model/filters/EventFilter.java b/server/src/main/java/com/mirth/connect/model/filters/EventFilter.java similarity index 100% rename from server/src/com/mirth/connect/model/filters/EventFilter.java rename to server/src/main/java/com/mirth/connect/model/filters/EventFilter.java diff --git a/server/src/com/mirth/connect/model/filters/MessageFilter.java b/server/src/main/java/com/mirth/connect/model/filters/MessageFilter.java similarity index 100% rename from server/src/com/mirth/connect/model/filters/MessageFilter.java rename to server/src/main/java/com/mirth/connect/model/filters/MessageFilter.java diff --git a/server/src/com/mirth/connect/model/filters/elements/ContentSearchElement.java b/server/src/main/java/com/mirth/connect/model/filters/elements/ContentSearchElement.java similarity index 100% rename from server/src/com/mirth/connect/model/filters/elements/ContentSearchElement.java rename to server/src/main/java/com/mirth/connect/model/filters/elements/ContentSearchElement.java diff --git a/server/src/com/mirth/connect/model/filters/elements/MetaDataSearchElement.java b/server/src/main/java/com/mirth/connect/model/filters/elements/MetaDataSearchElement.java similarity index 100% rename from server/src/com/mirth/connect/model/filters/elements/MetaDataSearchElement.java rename to server/src/main/java/com/mirth/connect/model/filters/elements/MetaDataSearchElement.java diff --git a/server/src/com/mirth/connect/model/filters/elements/MetaDataSearchOperator.java b/server/src/main/java/com/mirth/connect/model/filters/elements/MetaDataSearchOperator.java similarity index 100% rename from server/src/com/mirth/connect/model/filters/elements/MetaDataSearchOperator.java rename to server/src/main/java/com/mirth/connect/model/filters/elements/MetaDataSearchOperator.java diff --git a/server/src/com/mirth/connect/model/notification/Notification.java b/server/src/main/java/com/mirth/connect/model/notification/Notification.java similarity index 100% rename from server/src/com/mirth/connect/model/notification/Notification.java rename to server/src/main/java/com/mirth/connect/model/notification/Notification.java diff --git a/server/src/com/mirth/connect/model/purged/PurgedDocument.java b/server/src/main/java/com/mirth/connect/model/purged/PurgedDocument.java similarity index 100% rename from server/src/com/mirth/connect/model/purged/PurgedDocument.java rename to server/src/main/java/com/mirth/connect/model/purged/PurgedDocument.java diff --git a/server/src/com/mirth/connect/model/transmission/EOFCheckInputStream.java b/server/src/main/java/com/mirth/connect/model/transmission/EOFCheckInputStream.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/EOFCheckInputStream.java rename to server/src/main/java/com/mirth/connect/model/transmission/EOFCheckInputStream.java diff --git a/server/src/com/mirth/connect/model/transmission/StreamHandlerException.java b/server/src/main/java/com/mirth/connect/model/transmission/StreamHandlerException.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/StreamHandlerException.java rename to server/src/main/java/com/mirth/connect/model/transmission/StreamHandlerException.java diff --git a/server/src/com/mirth/connect/model/transmission/TransmissionModeProperties.java b/server/src/main/java/com/mirth/connect/model/transmission/TransmissionModeProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/TransmissionModeProperties.java rename to server/src/main/java/com/mirth/connect/model/transmission/TransmissionModeProperties.java diff --git a/server/src/com/mirth/connect/model/transmission/batch/DefaultBatchStreamReader.java b/server/src/main/java/com/mirth/connect/model/transmission/batch/DefaultBatchStreamReader.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/batch/DefaultBatchStreamReader.java rename to server/src/main/java/com/mirth/connect/model/transmission/batch/DefaultBatchStreamReader.java diff --git a/server/src/com/mirth/connect/model/transmission/batch/DelimiterBatchStreamReader.java b/server/src/main/java/com/mirth/connect/model/transmission/batch/DelimiterBatchStreamReader.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/batch/DelimiterBatchStreamReader.java rename to server/src/main/java/com/mirth/connect/model/transmission/batch/DelimiterBatchStreamReader.java diff --git a/server/src/com/mirth/connect/model/transmission/batch/RegexBatchStreamReader.java b/server/src/main/java/com/mirth/connect/model/transmission/batch/RegexBatchStreamReader.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/batch/RegexBatchStreamReader.java rename to server/src/main/java/com/mirth/connect/model/transmission/batch/RegexBatchStreamReader.java diff --git a/server/src/com/mirth/connect/model/transmission/framemode/FrameModeProperties.java b/server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameModeProperties.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/framemode/FrameModeProperties.java rename to server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameModeProperties.java diff --git a/server/src/com/mirth/connect/model/transmission/framemode/FrameStreamHandler.java b/server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameStreamHandler.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/framemode/FrameStreamHandler.java rename to server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameStreamHandler.java diff --git a/server/src/com/mirth/connect/model/transmission/framemode/FrameStreamHandlerException.java b/server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameStreamHandlerException.java similarity index 100% rename from server/src/com/mirth/connect/model/transmission/framemode/FrameStreamHandlerException.java rename to server/src/main/java/com/mirth/connect/model/transmission/framemode/FrameStreamHandlerException.java diff --git a/server/src/com/mirth/connect/model/util/DefaultMetaData.java b/server/src/main/java/com/mirth/connect/model/util/DefaultMetaData.java similarity index 100% rename from server/src/com/mirth/connect/model/util/DefaultMetaData.java rename to server/src/main/java/com/mirth/connect/model/util/DefaultMetaData.java diff --git a/server/src/com/mirth/connect/model/util/DefaultVocabulary.java b/server/src/main/java/com/mirth/connect/model/util/DefaultVocabulary.java similarity index 100% rename from server/src/com/mirth/connect/model/util/DefaultVocabulary.java rename to server/src/main/java/com/mirth/connect/model/util/DefaultVocabulary.java diff --git a/server/src/com/mirth/connect/model/util/ImportConverter.java b/server/src/main/java/com/mirth/connect/model/util/ImportConverter.java similarity index 100% rename from server/src/com/mirth/connect/model/util/ImportConverter.java rename to server/src/main/java/com/mirth/connect/model/util/ImportConverter.java diff --git a/server/src/com/mirth/connect/model/util/ImportConverter3_0_0.java b/server/src/main/java/com/mirth/connect/model/util/ImportConverter3_0_0.java similarity index 100% rename from server/src/com/mirth/connect/model/util/ImportConverter3_0_0.java rename to server/src/main/java/com/mirth/connect/model/util/ImportConverter3_0_0.java diff --git a/server/src/com/mirth/connect/model/util/JavaScriptConstants.java b/server/src/main/java/com/mirth/connect/model/util/JavaScriptConstants.java similarity index 100% rename from server/src/com/mirth/connect/model/util/JavaScriptConstants.java rename to server/src/main/java/com/mirth/connect/model/util/JavaScriptConstants.java diff --git a/server/src/com/mirth/connect/model/util/MessageVocabulary.java b/server/src/main/java/com/mirth/connect/model/util/MessageVocabulary.java similarity index 100% rename from server/src/com/mirth/connect/model/util/MessageVocabulary.java rename to server/src/main/java/com/mirth/connect/model/util/MessageVocabulary.java diff --git a/server/src/com/mirth/connect/model/util/MessageVocabularyFactory.java b/server/src/main/java/com/mirth/connect/model/util/MessageVocabularyFactory.java similarity index 100% rename from server/src/com/mirth/connect/model/util/MessageVocabularyFactory.java rename to server/src/main/java/com/mirth/connect/model/util/MessageVocabularyFactory.java diff --git a/server/src/com/mirth/connect/model/util/MigrationException.java b/server/src/main/java/com/mirth/connect/model/util/MigrationException.java similarity index 100% rename from server/src/com/mirth/connect/model/util/MigrationException.java rename to server/src/main/java/com/mirth/connect/model/util/MigrationException.java diff --git a/server/src/com/mirth/connect/plugins/AuthorizationPlugin.java b/server/src/main/java/com/mirth/connect/plugins/AuthorizationPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/AuthorizationPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/AuthorizationPlugin.java diff --git a/server/src/com/mirth/connect/plugins/BasicModeProvider.java b/server/src/main/java/com/mirth/connect/plugins/BasicModeProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/BasicModeProvider.java rename to server/src/main/java/com/mirth/connect/plugins/BasicModeProvider.java diff --git a/server/src/com/mirth/connect/plugins/ChannelPlugin.java b/server/src/main/java/com/mirth/connect/plugins/ChannelPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/ChannelPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/ChannelPlugin.java diff --git a/server/src/com/mirth/connect/plugins/CodeTemplateServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/CodeTemplateServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/CodeTemplateServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/CodeTemplateServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/DataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/DataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/DataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/DataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/LibraryPlugin.java b/server/src/main/java/com/mirth/connect/plugins/LibraryPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/LibraryPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/LibraryPlugin.java diff --git a/server/src/com/mirth/connect/plugins/MergePropertiesInterface.java b/server/src/main/java/com/mirth/connect/plugins/MergePropertiesInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/MergePropertiesInterface.java rename to server/src/main/java/com/mirth/connect/plugins/MergePropertiesInterface.java diff --git a/server/src/com/mirth/connect/plugins/MultiFactorAuthenticationPlugin.java b/server/src/main/java/com/mirth/connect/plugins/MultiFactorAuthenticationPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/MultiFactorAuthenticationPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/MultiFactorAuthenticationPlugin.java diff --git a/server/src/com/mirth/connect/plugins/ResourcePlugin.java b/server/src/main/java/com/mirth/connect/plugins/ResourcePlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/ResourcePlugin.java rename to server/src/main/java/com/mirth/connect/plugins/ResourcePlugin.java diff --git a/server/src/com/mirth/connect/plugins/ServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/ServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/ServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/ServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/ServicePlugin.java b/server/src/main/java/com/mirth/connect/plugins/ServicePlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/ServicePlugin.java rename to server/src/main/java/com/mirth/connect/plugins/ServicePlugin.java diff --git a/server/src/com/mirth/connect/plugins/TransmissionModeProvider.java b/server/src/main/java/com/mirth/connect/plugins/TransmissionModeProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/TransmissionModeProvider.java rename to server/src/main/java/com/mirth/connect/plugins/TransmissionModeProvider.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionStateItem.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionStateItem.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionStateItem.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionStateItem.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionStatusLogController.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionStatusLogController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/ConnectionStatusLogController.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/ConnectionStatusLogController.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorEventListener.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorEventListener.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorEventListener.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorEventListener.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusMonitor.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusMonitor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusMonitor.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusMonitor.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServlet.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServlet.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServlet.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServlet.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/DefaultConnectionLogController.java b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DefaultConnectionLogController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/DefaultConnectionLogController.java rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/DefaultConnectionLogController.java diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/dashboardstatus/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/dashboardstatus/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPruner.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPruner.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPruner.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPruner.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerController.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerController.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerController.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerException.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerException.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerException.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerException.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerInterface.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerInterface.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerInterface.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerJob.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerJob.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerJob.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerJob.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerService.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerService.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerService.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerService.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerServlet.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerServlet.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerServlet.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerServlet.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DataPrunerStatus.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerStatus.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DataPrunerStatus.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DataPrunerStatus.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/DefaultDataPrunerController.java b/server/src/main/java/com/mirth/connect/plugins/datapruner/DefaultDataPrunerController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/DefaultDataPrunerController.java rename to server/src/main/java/com/mirth/connect/plugins/datapruner/DefaultDataPrunerController.java diff --git a/server/src/com/mirth/connect/plugins/datapruner/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datapruner/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datapruner/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datapruner/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDeserializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDeserializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedDeserializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedDeserializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedReader.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedReader.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedReader.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedReader.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedXMLHandler.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedXMLHandler.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/DelimitedXMLHandler.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedXMLHandler.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/delimited/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMReference.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMReference.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMReference.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMReference.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMVocabulary.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMVocabulary.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/DICOMVocabulary.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/DICOMVocabulary.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/dicom/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/CompositeType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/CompositeType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/CompositeType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/CompositeType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/DataType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/DataType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/DataType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/DataType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIReader.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIReader.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIReader.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIReader.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDISerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDISerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDISerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDISerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDISerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDISerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDISerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDISerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/EDIXMLHandler.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIXMLHandler.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/EDIXMLHandler.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/EDIXMLHandler.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/ElementType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ElementType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/ElementType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ElementType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/FormatType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/FormatType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/FormatType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/FormatType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/LoopType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/LoopType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/LoopType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/LoopType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/ObjectFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ObjectFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/ObjectFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ObjectFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/SegmentType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/SegmentType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/SegmentType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/SegmentType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/TransactionType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/TransactionType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/TransactionType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/TransactionType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/UsageType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/UsageType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/UsageType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/UsageType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/ValidCodesType.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ValidCodesType.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/ValidCodesType.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/ValidCodesType.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/X12Vocabulary.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/X12Vocabulary.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/X12Vocabulary.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/X12Vocabulary.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/edi-to-xml-mapping.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/edi-to-xml-mapping.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/edi-to-xml-mapping.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/edi-to-xml-mapping.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/270.004010X092A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/271.004010X092A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/276.004010X093A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X070.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X070.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X070.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X070.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004010X093A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004020X104.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004020X104.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/277.004020X104.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/277.004020X104.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.27.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.27.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.27.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.27.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.27.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.27.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.27.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.27.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/278.004010X094A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/820.004010X061A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/834.004010X095A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/834.004010X095A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/834.004010X095A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/834.004010X095A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/835.004010X091A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X096A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X097A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098A1.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098A1.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098A1.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/837.004010X098A1.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/841.004010XXXC.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/841.004010XXXC.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/841.004010XXXC.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/841.004010XXXC.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/997.004010.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/997.004010.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/997.004010.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/997.004010.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/codes.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/codes.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/codes.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/codes.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/xml/map.xsd b/server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/map.xsd similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/edi/xml/map.xsd rename to server/src/main/java/com/mirth/connect/plugins/datatypes/edi/xml/map.xsd diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchStreamReader.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchStreamReader.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchStreamReader.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchStreamReader.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7Reader.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7Reader.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7Reader.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7Reader.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7Serializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7Serializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/ER7Serializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7Serializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ACKGenerator.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ACKGenerator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ACKGenerator.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ACKGenerator.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2AutoResponder.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2AutoResponder.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2AutoResponder.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2AutoResponder.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DeserializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DeserializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DeserializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DeserializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidator.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidator.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseValidator.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2SerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2SerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2SerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2SerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2Vocabulary.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2Vocabulary.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2Vocabulary.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2Vocabulary.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2XMLQuickParser.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2XMLQuickParser.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2XMLQuickParser.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2XMLQuickParser.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/XMLEncodedHL7Handler.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/XMLEncodedHL7Handler.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/XMLEncodedHL7Handler.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/XMLEncodedHL7Handler.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3SerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3SerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3SerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3SerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3Serializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3Serializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3Serializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3Serializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/JSONSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/JSONSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/JSONSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/json/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/json/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDeserializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDeserializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDeserializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDeserializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReader.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReader.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReader.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReader.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReference.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReference.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReference.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPReference.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPVocabulary.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPVocabulary.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPVocabulary.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPVocabulary.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPXMLHandler.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPXMLHandler.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPXMLHandler.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPXMLHandler.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/ncpdp.xsd b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/ncpdp.xsd similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/ncpdp.xsd rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/ncpdp.xsd diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/ncpdpD0.xsd b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/ncpdpD0.xsd similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/ncpdpD0.xsd rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/ncpdpD0.xsd diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/RawSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/RawSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/RawSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/raw/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/raw/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptor.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptor.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLBatchProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeDelegate.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeDelegate.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeDelegate.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeDelegate.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLSerializationProperties.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLSerializationProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLSerializationProperties.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLSerializationProperties.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/XMLSerializer.java b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLSerializer.java similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/XMLSerializer.java rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/XMLSerializer.java diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/datatypes/xml/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/datatypes/xml/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java b/server/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java rename to server/src/main/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.java diff --git a/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/destinationsetfilter/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/destinationsetfilter/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/dicomviewer/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/dicomviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourcePlugin.java b/server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourcePlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourcePlugin.java rename to server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourcePlugin.java diff --git a/server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.java b/server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.java rename to server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.java diff --git a/server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceServlet.java b/server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceServlet.java similarity index 100% rename from server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceServlet.java rename to server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceServlet.java diff --git a/server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.java b/server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.java rename to server/src/main/java/com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.java diff --git a/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/directoryresource/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/directoryresource/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/directoryresource/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/DefaultGlobalMapController.java b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/DefaultGlobalMapController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/DefaultGlobalMapController.java rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/DefaultGlobalMapController.java diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapController.java b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapController.java rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapController.java diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapProvider.java b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapProvider.java rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapProvider.java diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapServlet.java b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapServlet.java similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapServlet.java rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapServlet.java diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.java b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.java rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.java diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/globalmapviewer/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/globalmapviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/httpauth/AuthenticationResult.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticationResult.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/AuthenticationResult.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticationResult.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/Authenticator.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/Authenticator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/Authenticator.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/Authenticator.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/AuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/AuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/AuthenticatorProviderFactory.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticatorProviderFactory.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/AuthenticatorProviderFactory.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/AuthenticatorProviderFactory.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/HttpAuthServicePlugin.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthServicePlugin.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/HttpAuthServicePlugin.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/HttpAuthServicePlugin.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/RequestInfo.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/RequestInfo.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/RequestInfo.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/RequestInfo.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticator.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticator.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticator.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/custom/CustomAuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/custom/CustomAuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/custom/CustomAuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/custom/CustomAuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticator.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticator.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticator.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticator.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticator.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticator.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptAuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2Authenticator.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2Authenticator.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2Authenticator.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2Authenticator.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2AuthenticatorProvider.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2AuthenticatorProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2AuthenticatorProvider.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2AuthenticatorProvider.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/httpauth/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/httpauth/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.java diff --git a/server/src/com/mirth/connect/plugins/httpauth/userutil/package-info.java b/server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/package-info.java similarity index 100% rename from server/src/com/mirth/connect/plugins/httpauth/userutil/package-info.java rename to server/src/main/java/com/mirth/connect/plugins/httpauth/userutil/package-info.java diff --git a/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/imageviewer/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/imageviewer/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/imageviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/javascriptrule/JavaScriptRule.java b/server/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptRule.java similarity index 100% rename from server/src/com/mirth/connect/plugins/javascriptrule/JavaScriptRule.java rename to server/src/main/java/com/mirth/connect/plugins/javascriptrule/JavaScriptRule.java diff --git a/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/javascriptrule/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/javascriptrule/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/javascriptstep/JavaScriptStep.java b/server/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/javascriptstep/JavaScriptStep.java rename to server/src/main/java/com/mirth/connect/plugins/javascriptstep/JavaScriptStep.java diff --git a/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/javascriptstep/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/javascriptstep/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/mapper/MapperStep.java b/server/src/main/java/com/mirth/connect/plugins/mapper/MapperStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/mapper/MapperStep.java rename to server/src/main/java/com/mirth/connect/plugins/mapper/MapperStep.java diff --git a/server/src/com/mirth/connect/plugins/mapper/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/mapper/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/mapper/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/mapper/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.java b/server/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.java rename to server/src/main/java/com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.java diff --git a/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/messagebuilder/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/messagebuilder/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/mllpmode/MLLPModeProperties.java b/server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeProperties.java similarity index 100% rename from server/src/com/mirth/connect/plugins/mllpmode/MLLPModeProperties.java rename to server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeProperties.java diff --git a/server/src/com/mirth/connect/plugins/mllpmode/MLLPModeProvider.java b/server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/mllpmode/MLLPModeProvider.java rename to server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPModeProvider.java diff --git a/server/src/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandler.java b/server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandler.java similarity index 100% rename from server/src/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandler.java rename to server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandler.java diff --git a/server/src/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandlerException.java b/server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandlerException.java similarity index 100% rename from server/src/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandlerException.java rename to server/src/main/java/com/mirth/connect/plugins/mllpmode/MLLPv2StreamHandlerException.java diff --git a/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/mllpmode/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/mllpmode/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/mllpmode/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/pdfviewer/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/pdfviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java b/server/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java similarity index 100% rename from server/src/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java rename to server/src/main/java/com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.java diff --git a/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/rulebuilder/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/rulebuilder/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.java b/server/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.java similarity index 100% rename from server/src/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.java rename to server/src/main/java/com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.java diff --git a/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/scriptfilerule/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/scriptfilerule/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.java b/server/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.java rename to server/src/main/java/com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.java diff --git a/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/scriptfilestep/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/scriptfilestep/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/serverlog/ArrayAppender.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ArrayAppender.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ArrayAppender.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ArrayAppender.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/DefaultServerLogController.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/DefaultServerLogController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/DefaultServerLogController.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/DefaultServerLogController.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/ServerLogController.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogController.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ServerLogController.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogController.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/ServerLogItem.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogItem.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ServerLogItem.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogItem.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/ServerLogProvider.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogProvider.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ServerLogProvider.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogProvider.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/ServerLogServlet.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogServlet.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ServerLogServlet.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogServlet.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/ServerLogServletInterface.java b/server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogServletInterface.java similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/ServerLogServletInterface.java rename to server/src/main/java/com/mirth/connect/plugins/serverlog/ServerLogServletInterface.java diff --git a/server/src/com/mirth/connect/plugins/serverlog/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/serverlog/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/serverlog/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/serverlog/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/textviewer/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/textviewer/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/textviewer/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/textviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/xsltstep/XsltStep.java b/server/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStep.java similarity index 100% rename from server/src/com/mirth/connect/plugins/xsltstep/XsltStep.java rename to server/src/main/java/com/mirth/connect/plugins/xsltstep/XsltStep.java diff --git a/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml b/server/src/main/java/com/mirth/connect/plugins/xsltstep/plugin.xml similarity index 100% rename from server/src/com/mirth/connect/plugins/xsltstep/plugin.xml rename to server/src/main/java/com/mirth/connect/plugins/xsltstep/plugin.xml diff --git a/server/src/com/mirth/connect/server/Command.java b/server/src/main/java/com/mirth/connect/server/Command.java similarity index 100% rename from server/src/com/mirth/connect/server/Command.java rename to server/src/main/java/com/mirth/connect/server/Command.java diff --git a/server/src/com/mirth/connect/server/CommandQueue.java b/server/src/main/java/com/mirth/connect/server/CommandQueue.java similarity index 100% rename from server/src/com/mirth/connect/server/CommandQueue.java rename to server/src/main/java/com/mirth/connect/server/CommandQueue.java diff --git a/server/src/com/mirth/connect/server/ExtensionLoader.java b/server/src/main/java/com/mirth/connect/server/ExtensionLoader.java similarity index 100% rename from server/src/com/mirth/connect/server/ExtensionLoader.java rename to server/src/main/java/com/mirth/connect/server/ExtensionLoader.java diff --git a/server/src/com/mirth/connect/server/MethodFilter.java b/server/src/main/java/com/mirth/connect/server/MethodFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/MethodFilter.java rename to server/src/main/java/com/mirth/connect/server/MethodFilter.java diff --git a/server/src/com/mirth/connect/server/Mirth.java b/server/src/main/java/com/mirth/connect/server/Mirth.java similarity index 100% rename from server/src/com/mirth/connect/server/Mirth.java rename to server/src/main/java/com/mirth/connect/server/Mirth.java diff --git a/server/src/com/mirth/connect/server/MirthException.java b/server/src/main/java/com/mirth/connect/server/MirthException.java similarity index 100% rename from server/src/com/mirth/connect/server/MirthException.java rename to server/src/main/java/com/mirth/connect/server/MirthException.java diff --git a/server/src/com/mirth/connect/server/MirthJavascriptTransformerException.java b/server/src/main/java/com/mirth/connect/server/MirthJavascriptTransformerException.java similarity index 100% rename from server/src/com/mirth/connect/server/MirthJavascriptTransformerException.java rename to server/src/main/java/com/mirth/connect/server/MirthJavascriptTransformerException.java diff --git a/server/src/com/mirth/connect/server/MirthScopeProvider.java b/server/src/main/java/com/mirth/connect/server/MirthScopeProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/MirthScopeProvider.java rename to server/src/main/java/com/mirth/connect/server/MirthScopeProvider.java diff --git a/server/src/com/mirth/connect/server/MirthWebServer.java b/server/src/main/java/com/mirth/connect/server/MirthWebServer.java similarity index 100% rename from server/src/com/mirth/connect/server/MirthWebServer.java rename to server/src/main/java/com/mirth/connect/server/MirthWebServer.java diff --git a/server/src/com/mirth/connect/server/alert/Alert.java b/server/src/main/java/com/mirth/connect/server/alert/Alert.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/Alert.java rename to server/src/main/java/com/mirth/connect/server/alert/Alert.java diff --git a/server/src/com/mirth/connect/server/alert/AlertActionAcceptor.java b/server/src/main/java/com/mirth/connect/server/alert/AlertActionAcceptor.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/AlertActionAcceptor.java rename to server/src/main/java/com/mirth/connect/server/alert/AlertActionAcceptor.java diff --git a/server/src/com/mirth/connect/server/alert/AlertWorker.java b/server/src/main/java/com/mirth/connect/server/alert/AlertWorker.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/AlertWorker.java rename to server/src/main/java/com/mirth/connect/server/alert/AlertWorker.java diff --git a/server/src/com/mirth/connect/server/alert/DefaultAlertWorker.java b/server/src/main/java/com/mirth/connect/server/alert/DefaultAlertWorker.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/DefaultAlertWorker.java rename to server/src/main/java/com/mirth/connect/server/alert/DefaultAlertWorker.java diff --git a/server/src/com/mirth/connect/server/alert/action/ChannelProtocol.java b/server/src/main/java/com/mirth/connect/server/alert/action/ChannelProtocol.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/action/ChannelProtocol.java rename to server/src/main/java/com/mirth/connect/server/alert/action/ChannelProtocol.java diff --git a/server/src/com/mirth/connect/server/alert/action/EmailProtocol.java b/server/src/main/java/com/mirth/connect/server/alert/action/EmailProtocol.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/action/EmailProtocol.java rename to server/src/main/java/com/mirth/connect/server/alert/action/EmailProtocol.java diff --git a/server/src/com/mirth/connect/server/alert/action/Protocol.java b/server/src/main/java/com/mirth/connect/server/alert/action/Protocol.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/action/Protocol.java rename to server/src/main/java/com/mirth/connect/server/alert/action/Protocol.java diff --git a/server/src/com/mirth/connect/server/alert/action/UserProtocol.java b/server/src/main/java/com/mirth/connect/server/alert/action/UserProtocol.java similarity index 100% rename from server/src/com/mirth/connect/server/alert/action/UserProtocol.java rename to server/src/main/java/com/mirth/connect/server/alert/action/UserProtocol.java diff --git a/server/src/com/mirth/connect/server/api/CheckAuthorizedChannelId.java b/server/src/main/java/com/mirth/connect/server/api/CheckAuthorizedChannelId.java similarity index 100% rename from server/src/com/mirth/connect/server/api/CheckAuthorizedChannelId.java rename to server/src/main/java/com/mirth/connect/server/api/CheckAuthorizedChannelId.java diff --git a/server/src/com/mirth/connect/server/api/CheckAuthorizedUserId.java b/server/src/main/java/com/mirth/connect/server/api/CheckAuthorizedUserId.java similarity index 100% rename from server/src/com/mirth/connect/server/api/CheckAuthorizedUserId.java rename to server/src/main/java/com/mirth/connect/server/api/CheckAuthorizedUserId.java diff --git a/server/src/com/mirth/connect/server/api/DontCheckAuthorized.java b/server/src/main/java/com/mirth/connect/server/api/DontCheckAuthorized.java similarity index 100% rename from server/src/com/mirth/connect/server/api/DontCheckAuthorized.java rename to server/src/main/java/com/mirth/connect/server/api/DontCheckAuthorized.java diff --git a/server/src/com/mirth/connect/server/api/MirthServlet.java b/server/src/main/java/com/mirth/connect/server/api/MirthServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/MirthServlet.java rename to server/src/main/java/com/mirth/connect/server/api/MirthServlet.java diff --git a/server/src/com/mirth/connect/server/api/providers/ApiOriginFilter.java b/server/src/main/java/com/mirth/connect/server/api/providers/ApiOriginFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/ApiOriginFilter.java rename to server/src/main/java/com/mirth/connect/server/api/providers/ApiOriginFilter.java diff --git a/server/src/com/mirth/connect/server/api/providers/ClickjackingFilter.java b/server/src/main/java/com/mirth/connect/server/api/providers/ClickjackingFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/ClickjackingFilter.java rename to server/src/main/java/com/mirth/connect/server/api/providers/ClickjackingFilter.java diff --git a/server/src/com/mirth/connect/server/api/providers/MirthOperationFeature.java b/server/src/main/java/com/mirth/connect/server/api/providers/MirthOperationFeature.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/MirthOperationFeature.java rename to server/src/main/java/com/mirth/connect/server/api/providers/MirthOperationFeature.java diff --git a/server/src/com/mirth/connect/server/api/providers/MirthResourceInvocationHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/api/providers/MirthResourceInvocationHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/MirthResourceInvocationHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/api/providers/MirthResourceInvocationHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/api/providers/RequestedWithFilter.java b/server/src/main/java/com/mirth/connect/server/api/providers/RequestedWithFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/RequestedWithFilter.java rename to server/src/main/java/com/mirth/connect/server/api/providers/RequestedWithFilter.java diff --git a/server/src/com/mirth/connect/server/api/providers/ResponseCodeFilter.java b/server/src/main/java/com/mirth/connect/server/api/providers/ResponseCodeFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/ResponseCodeFilter.java rename to server/src/main/java/com/mirth/connect/server/api/providers/ResponseCodeFilter.java diff --git a/server/src/com/mirth/connect/server/api/providers/StrictTransportSecurityFilter.java b/server/src/main/java/com/mirth/connect/server/api/providers/StrictTransportSecurityFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/api/providers/StrictTransportSecurityFilter.java rename to server/src/main/java/com/mirth/connect/server/api/providers/StrictTransportSecurityFilter.java diff --git a/server/src/com/mirth/connect/server/api/servlets/AlertServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/AlertServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/AlertServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/AlertServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ChannelGroupServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ChannelGroupServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ChannelGroupServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ChannelGroupServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ChannelServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ChannelServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ChannelServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ChannelServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ChannelStatisticsServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ChannelStatisticsServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ChannelStatisticsServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ChannelStatisticsServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ChannelStatusServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ChannelStatusServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ChannelStatusServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ChannelStatusServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/CodeTemplateServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/CodeTemplateServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/CodeTemplateServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/CodeTemplateServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ConfigurationServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ConfigurationServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ConfigurationServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ConfigurationServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/DatabaseTaskServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/DatabaseTaskServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/DatabaseTaskServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/DatabaseTaskServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/EngineServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/EngineServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/EngineServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/EngineServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/EventServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/EventServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/EventServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/EventServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/ExtensionServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/ExtensionServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/ExtensionServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/ExtensionServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/MessageServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/MessageServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/MessageServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/MessageServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/SystemServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/SystemServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/SystemServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/SystemServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/UsageServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/UsageServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/UsageServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/UsageServlet.java diff --git a/server/src/com/mirth/connect/server/api/servlets/UserServlet.java b/server/src/main/java/com/mirth/connect/server/api/servlets/UserServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/api/servlets/UserServlet.java rename to server/src/main/java/com/mirth/connect/server/api/servlets/UserServlet.java diff --git a/server/src/com/mirth/connect/server/attachments/MirthAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/MirthAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/MirthAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/MirthAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandler.java b/server/src/main/java/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandler.java rename to server/src/main/java/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandler.java diff --git a/server/src/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/dicom/DICOMAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandler.java b/server/src/main/java/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandler.java rename to server/src/main/java/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandler.java diff --git a/server/src/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/identity/IdentityAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandler.java b/server/src/main/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandler.java rename to server/src/main/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandler.java diff --git a/server/src/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandler.java b/server/src/main/java/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandler.java rename to server/src/main/java/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandler.java diff --git a/server/src/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/passthru/PassthruAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/regex/RegexAttachmentHandler.java b/server/src/main/java/com/mirth/connect/server/attachments/regex/RegexAttachmentHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/regex/RegexAttachmentHandler.java rename to server/src/main/java/com/mirth/connect/server/attachments/regex/RegexAttachmentHandler.java diff --git a/server/src/com/mirth/connect/server/attachments/regex/RegexAttachmentHandlerProvider.java b/server/src/main/java/com/mirth/connect/server/attachments/regex/RegexAttachmentHandlerProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/regex/RegexAttachmentHandlerProvider.java rename to server/src/main/java/com/mirth/connect/server/attachments/regex/RegexAttachmentHandlerProvider.java diff --git a/server/src/com/mirth/connect/server/attachments/regex/RegexInfo.java b/server/src/main/java/com/mirth/connect/server/attachments/regex/RegexInfo.java similarity index 100% rename from server/src/com/mirth/connect/server/attachments/regex/RegexInfo.java rename to server/src/main/java/com/mirth/connect/server/attachments/regex/RegexInfo.java diff --git a/server/src/com/mirth/connect/server/builders/JavaScriptBuilder.java b/server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java similarity index 100% rename from server/src/com/mirth/connect/server/builders/JavaScriptBuilder.java rename to server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java diff --git a/server/src/com/mirth/connect/server/channel/ChannelFuture.java b/server/src/main/java/com/mirth/connect/server/channel/ChannelFuture.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/ChannelFuture.java rename to server/src/main/java/com/mirth/connect/server/channel/ChannelFuture.java diff --git a/server/src/com/mirth/connect/server/channel/ChannelTask.java b/server/src/main/java/com/mirth/connect/server/channel/ChannelTask.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/ChannelTask.java rename to server/src/main/java/com/mirth/connect/server/channel/ChannelTask.java diff --git a/server/src/com/mirth/connect/server/channel/ChannelTaskHandler.java b/server/src/main/java/com/mirth/connect/server/channel/ChannelTaskHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/ChannelTaskHandler.java rename to server/src/main/java/com/mirth/connect/server/channel/ChannelTaskHandler.java diff --git a/server/src/com/mirth/connect/server/channel/DelegateErrorTaskHandler.java b/server/src/main/java/com/mirth/connect/server/channel/DelegateErrorTaskHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/DelegateErrorTaskHandler.java rename to server/src/main/java/com/mirth/connect/server/channel/DelegateErrorTaskHandler.java diff --git a/server/src/com/mirth/connect/server/channel/ErrorTaskHandler.java b/server/src/main/java/com/mirth/connect/server/channel/ErrorTaskHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/ErrorTaskHandler.java rename to server/src/main/java/com/mirth/connect/server/channel/ErrorTaskHandler.java diff --git a/server/src/com/mirth/connect/server/channel/LoggingTaskHandler.java b/server/src/main/java/com/mirth/connect/server/channel/LoggingTaskHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/LoggingTaskHandler.java rename to server/src/main/java/com/mirth/connect/server/channel/LoggingTaskHandler.java diff --git a/server/src/com/mirth/connect/server/channel/MirthMessageMaps.java b/server/src/main/java/com/mirth/connect/server/channel/MirthMessageMaps.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/MirthMessageMaps.java rename to server/src/main/java/com/mirth/connect/server/channel/MirthMessageMaps.java diff --git a/server/src/com/mirth/connect/server/channel/MirthMetaDataReplacer.java b/server/src/main/java/com/mirth/connect/server/channel/MirthMetaDataReplacer.java similarity index 100% rename from server/src/com/mirth/connect/server/channel/MirthMetaDataReplacer.java rename to server/src/main/java/com/mirth/connect/server/channel/MirthMetaDataReplacer.java diff --git a/server/src/com/mirth/connect/server/controllers/AlertController.java b/server/src/main/java/com/mirth/connect/server/controllers/AlertController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/AlertController.java rename to server/src/main/java/com/mirth/connect/server/controllers/AlertController.java diff --git a/server/src/com/mirth/connect/server/controllers/AuthorizationController.java b/server/src/main/java/com/mirth/connect/server/controllers/AuthorizationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/AuthorizationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/AuthorizationController.java diff --git a/server/src/com/mirth/connect/server/controllers/Cache.java b/server/src/main/java/com/mirth/connect/server/controllers/Cache.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/Cache.java rename to server/src/main/java/com/mirth/connect/server/controllers/Cache.java diff --git a/server/src/com/mirth/connect/server/controllers/ChannelAuthorizer.java b/server/src/main/java/com/mirth/connect/server/controllers/ChannelAuthorizer.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ChannelAuthorizer.java rename to server/src/main/java/com/mirth/connect/server/controllers/ChannelAuthorizer.java diff --git a/server/src/com/mirth/connect/server/controllers/ChannelConfigurationException.java b/server/src/main/java/com/mirth/connect/server/controllers/ChannelConfigurationException.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ChannelConfigurationException.java rename to server/src/main/java/com/mirth/connect/server/controllers/ChannelConfigurationException.java diff --git a/server/src/com/mirth/connect/server/controllers/ChannelController.java b/server/src/main/java/com/mirth/connect/server/controllers/ChannelController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ChannelController.java rename to server/src/main/java/com/mirth/connect/server/controllers/ChannelController.java diff --git a/server/src/com/mirth/connect/server/controllers/CodeTemplateController.java b/server/src/main/java/com/mirth/connect/server/controllers/CodeTemplateController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/CodeTemplateController.java rename to server/src/main/java/com/mirth/connect/server/controllers/CodeTemplateController.java diff --git a/server/src/com/mirth/connect/server/controllers/ConfigurationController.java b/server/src/main/java/com/mirth/connect/server/controllers/ConfigurationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ConfigurationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/ConfigurationController.java diff --git a/server/src/com/mirth/connect/server/controllers/ContextFactoryController.java b/server/src/main/java/com/mirth/connect/server/controllers/ContextFactoryController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ContextFactoryController.java rename to server/src/main/java/com/mirth/connect/server/controllers/ContextFactoryController.java diff --git a/server/src/com/mirth/connect/server/controllers/Controller.java b/server/src/main/java/com/mirth/connect/server/controllers/Controller.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/Controller.java rename to server/src/main/java/com/mirth/connect/server/controllers/Controller.java diff --git a/server/src/com/mirth/connect/server/controllers/ControllerFactory.java b/server/src/main/java/com/mirth/connect/server/controllers/ControllerFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ControllerFactory.java rename to server/src/main/java/com/mirth/connect/server/controllers/ControllerFactory.java diff --git a/server/src/com/mirth/connect/server/controllers/DatabaseTaskController.java b/server/src/main/java/com/mirth/connect/server/controllers/DatabaseTaskController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DatabaseTaskController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DatabaseTaskController.java diff --git a/server/src/com/mirth/connect/server/controllers/DebugUsageController.java b/server/src/main/java/com/mirth/connect/server/controllers/DebugUsageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DebugUsageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DebugUsageController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultAlertController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultAlertController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultAlertController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultAlertController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultAuthorizationController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultAuthorizationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultAuthorizationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultAuthorizationController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultChannelController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultChannelController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultChannelController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultChannelController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultCodeTemplateController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultCodeTemplateController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultCodeTemplateController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultCodeTemplateController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultConfigurationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultConfigurationController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultContextFactoryController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultContextFactoryController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultContextFactoryController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultContextFactoryController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultControllerFactory.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultControllerFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultControllerFactory.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultControllerFactory.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultDatabaseTaskController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultDatabaseTaskController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultDatabaseTaskController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultDatabaseTaskController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultDebugUsageController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultDebugUsageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultEventController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultEventController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultEventController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultEventController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultExtensionController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultExtensionController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultMigrationController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultMigrationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultMigrationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultMigrationController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultScriptController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultScriptController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultScriptController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultScriptController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultUsageController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultUsageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultUsageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultUsageController.java diff --git a/server/src/com/mirth/connect/server/controllers/DefaultUserController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultUserController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DefaultUserController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DefaultUserController.java diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java b/server/src/main/java/com/mirth/connect/server/controllers/DonkeyEngineController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DonkeyEngineController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DonkeyEngineController.java diff --git a/server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java b/server/src/main/java/com/mirth/connect/server/controllers/DonkeyMessageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/DonkeyMessageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/DonkeyMessageController.java diff --git a/server/src/com/mirth/connect/server/controllers/EngineController.java b/server/src/main/java/com/mirth/connect/server/controllers/EngineController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/EngineController.java rename to server/src/main/java/com/mirth/connect/server/controllers/EngineController.java diff --git a/server/src/com/mirth/connect/server/controllers/EventController.java b/server/src/main/java/com/mirth/connect/server/controllers/EventController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/EventController.java rename to server/src/main/java/com/mirth/connect/server/controllers/EventController.java diff --git a/server/src/com/mirth/connect/server/controllers/ExtensionController.java b/server/src/main/java/com/mirth/connect/server/controllers/ExtensionController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ExtensionController.java rename to server/src/main/java/com/mirth/connect/server/controllers/ExtensionController.java diff --git a/server/src/com/mirth/connect/server/controllers/MessageController.java b/server/src/main/java/com/mirth/connect/server/controllers/MessageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/MessageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/MessageController.java diff --git a/server/src/com/mirth/connect/server/controllers/MigrationController.java b/server/src/main/java/com/mirth/connect/server/controllers/MigrationController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/MigrationController.java rename to server/src/main/java/com/mirth/connect/server/controllers/MigrationController.java diff --git a/server/src/com/mirth/connect/server/controllers/ScriptCompileException.java b/server/src/main/java/com/mirth/connect/server/controllers/ScriptCompileException.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ScriptCompileException.java rename to server/src/main/java/com/mirth/connect/server/controllers/ScriptCompileException.java diff --git a/server/src/com/mirth/connect/server/controllers/ScriptController.java b/server/src/main/java/com/mirth/connect/server/controllers/ScriptController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ScriptController.java rename to server/src/main/java/com/mirth/connect/server/controllers/ScriptController.java diff --git a/server/src/com/mirth/connect/server/controllers/ServerConfigurationRestorer.java b/server/src/main/java/com/mirth/connect/server/controllers/ServerConfigurationRestorer.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/ServerConfigurationRestorer.java rename to server/src/main/java/com/mirth/connect/server/controllers/ServerConfigurationRestorer.java diff --git a/server/src/com/mirth/connect/server/controllers/UsageController.java b/server/src/main/java/com/mirth/connect/server/controllers/UsageController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/UsageController.java rename to server/src/main/java/com/mirth/connect/server/controllers/UsageController.java diff --git a/server/src/com/mirth/connect/server/controllers/UserController.java b/server/src/main/java/com/mirth/connect/server/controllers/UserController.java similarity index 100% rename from server/src/com/mirth/connect/server/controllers/UserController.java rename to server/src/main/java/com/mirth/connect/server/controllers/UserController.java diff --git a/server/src/com/mirth/connect/server/event/AuditableEventListener.java b/server/src/main/java/com/mirth/connect/server/event/AuditableEventListener.java similarity index 100% rename from server/src/com/mirth/connect/server/event/AuditableEventListener.java rename to server/src/main/java/com/mirth/connect/server/event/AuditableEventListener.java diff --git a/server/src/com/mirth/connect/server/event/EventListener.java b/server/src/main/java/com/mirth/connect/server/event/EventListener.java similarity index 100% rename from server/src/com/mirth/connect/server/event/EventListener.java rename to server/src/main/java/com/mirth/connect/server/event/EventListener.java diff --git a/server/src/com/mirth/connect/server/extprops/ExtensionStatusFile.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusFile.java similarity index 100% rename from server/src/com/mirth/connect/server/extprops/ExtensionStatusFile.java rename to server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusFile.java diff --git a/server/src/com/mirth/connect/server/extprops/ExtensionStatusInterface.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusInterface.java similarity index 100% rename from server/src/com/mirth/connect/server/extprops/ExtensionStatusInterface.java rename to server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusInterface.java diff --git a/server/src/com/mirth/connect/server/extprops/ExtensionStatusProvider.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java similarity index 100% rename from server/src/com/mirth/connect/server/extprops/ExtensionStatusProvider.java rename to server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java diff --git a/server/src/com/mirth/connect/server/extprops/ExtensionStatuses.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java similarity index 100% rename from server/src/com/mirth/connect/server/extprops/ExtensionStatuses.java rename to server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java diff --git a/server/src/com/mirth/connect/server/extprops/LoggerWrapper.java b/server/src/main/java/com/mirth/connect/server/extprops/LoggerWrapper.java similarity index 100% rename from server/src/com/mirth/connect/server/extprops/LoggerWrapper.java rename to server/src/main/java/com/mirth/connect/server/extprops/LoggerWrapper.java diff --git a/server/src/com/mirth/connect/server/launcher/ManifestDirectory.java b/server/src/main/java/com/mirth/connect/server/launcher/ManifestDirectory.java similarity index 100% rename from server/src/com/mirth/connect/server/launcher/ManifestDirectory.java rename to server/src/main/java/com/mirth/connect/server/launcher/ManifestDirectory.java diff --git a/server/src/com/mirth/connect/server/launcher/ManifestEntry.java b/server/src/main/java/com/mirth/connect/server/launcher/ManifestEntry.java similarity index 100% rename from server/src/com/mirth/connect/server/launcher/ManifestEntry.java rename to server/src/main/java/com/mirth/connect/server/launcher/ManifestEntry.java diff --git a/server/src/com/mirth/connect/server/launcher/ManifestFile.java b/server/src/main/java/com/mirth/connect/server/launcher/ManifestFile.java similarity index 100% rename from server/src/com/mirth/connect/server/launcher/ManifestFile.java rename to server/src/main/java/com/mirth/connect/server/launcher/ManifestFile.java diff --git a/server/src/com/mirth/connect/server/launcher/MirthLauncher.java b/server/src/main/java/com/mirth/connect/server/launcher/MirthLauncher.java similarity index 100% rename from server/src/com/mirth/connect/server/launcher/MirthLauncher.java rename to server/src/main/java/com/mirth/connect/server/launcher/MirthLauncher.java diff --git a/server/src/com/mirth/connect/server/logging/JuliToLog4JService.java b/server/src/main/java/com/mirth/connect/server/logging/JuliToLog4JService.java similarity index 100% rename from server/src/com/mirth/connect/server/logging/JuliToLog4JService.java rename to server/src/main/java/com/mirth/connect/server/logging/JuliToLog4JService.java diff --git a/server/src/com/mirth/connect/server/logging/JuliToLog4jHandler.java b/server/src/main/java/com/mirth/connect/server/logging/JuliToLog4jHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/logging/JuliToLog4jHandler.java rename to server/src/main/java/com/mirth/connect/server/logging/JuliToLog4jHandler.java diff --git a/server/src/com/mirth/connect/server/logging/LogOutputStream.java b/server/src/main/java/com/mirth/connect/server/logging/LogOutputStream.java similarity index 100% rename from server/src/com/mirth/connect/server/logging/LogOutputStream.java rename to server/src/main/java/com/mirth/connect/server/logging/LogOutputStream.java diff --git a/server/src/com/mirth/connect/server/logging/MirthLog4jFilter.java b/server/src/main/java/com/mirth/connect/server/logging/MirthLog4jFilter.java similarity index 100% rename from server/src/com/mirth/connect/server/logging/MirthLog4jFilter.java rename to server/src/main/java/com/mirth/connect/server/logging/MirthLog4jFilter.java diff --git a/server/src/com/mirth/connect/server/mbeans/MirthService.java b/server/src/main/java/com/mirth/connect/server/mbeans/MirthService.java similarity index 100% rename from server/src/com/mirth/connect/server/mbeans/MirthService.java rename to server/src/main/java/com/mirth/connect/server/mbeans/MirthService.java diff --git a/server/src/com/mirth/connect/server/mbeans/MirthServiceMBean.java b/server/src/main/java/com/mirth/connect/server/mbeans/MirthServiceMBean.java similarity index 100% rename from server/src/com/mirth/connect/server/mbeans/MirthServiceMBean.java rename to server/src/main/java/com/mirth/connect/server/mbeans/MirthServiceMBean.java diff --git a/server/src/com/mirth/connect/server/message/DataTypeFactory.java b/server/src/main/java/com/mirth/connect/server/message/DataTypeFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/message/DataTypeFactory.java rename to server/src/main/java/com/mirth/connect/server/message/DataTypeFactory.java diff --git a/server/src/com/mirth/connect/server/message/DebuggableBatchAdaptor.java b/server/src/main/java/com/mirth/connect/server/message/DebuggableBatchAdaptor.java similarity index 100% rename from server/src/com/mirth/connect/server/message/DebuggableBatchAdaptor.java rename to server/src/main/java/com/mirth/connect/server/message/DebuggableBatchAdaptor.java diff --git a/server/src/com/mirth/connect/server/message/DebuggableBatchAdaptorFactory.java b/server/src/main/java/com/mirth/connect/server/message/DebuggableBatchAdaptorFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/message/DebuggableBatchAdaptorFactory.java rename to server/src/main/java/com/mirth/connect/server/message/DebuggableBatchAdaptorFactory.java diff --git a/server/src/com/mirth/connect/server/message/DefaultAutoResponder.java b/server/src/main/java/com/mirth/connect/server/message/DefaultAutoResponder.java similarity index 100% rename from server/src/com/mirth/connect/server/message/DefaultAutoResponder.java rename to server/src/main/java/com/mirth/connect/server/message/DefaultAutoResponder.java diff --git a/server/src/com/mirth/connect/server/message/DefaultResponseValidator.java b/server/src/main/java/com/mirth/connect/server/message/DefaultResponseValidator.java similarity index 100% rename from server/src/com/mirth/connect/server/message/DefaultResponseValidator.java rename to server/src/main/java/com/mirth/connect/server/message/DefaultResponseValidator.java diff --git a/server/src/com/mirth/connect/server/migration/ConfigurationMigrator.java b/server/src/main/java/com/mirth/connect/server/migration/ConfigurationMigrator.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/ConfigurationMigrator.java rename to server/src/main/java/com/mirth/connect/server/migration/ConfigurationMigrator.java diff --git a/server/src/com/mirth/connect/server/migration/LegacyMigrator.java b/server/src/main/java/com/mirth/connect/server/migration/LegacyMigrator.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/LegacyMigrator.java rename to server/src/main/java/com/mirth/connect/server/migration/LegacyMigrator.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate2_0_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate2_0_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate2_0_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate2_0_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate2_2_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate2_2_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate2_2_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate2_2_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_0_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_0_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_0_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_0_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_0_2.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_0_2.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_0_2.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_0_2.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_11_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_11_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_11_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_11_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_12_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_12_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_12_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_12_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_1_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_1_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_1_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_1_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_1_1.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_1_1.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_1_1.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_1_1.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_2_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_2_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_2_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_2_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_2_2.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_2_2.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_2_2.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_2_2.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_3_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_3_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_3_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_3_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_4_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_4_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_4_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_4_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_5_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_5_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_5_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_5_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_7_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_7_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_7_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_7_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate3_8_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate3_8_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate3_8_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate3_8_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate4_0_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate4_0_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate4_0_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate4_0_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate4_1_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate4_1_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate4_1_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate4_1_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate4_3_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate4_3_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate4_3_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate4_3_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate4_4_0.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate4_4_0.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate4_4_0.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate4_4_0.java diff --git a/server/src/com/mirth/connect/server/migration/Migrate4_5_2.java b/server/src/main/java/com/mirth/connect/server/migration/Migrate4_5_2.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrate4_5_2.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrate4_5_2.java diff --git a/server/src/com/mirth/connect/server/migration/Migrator.java b/server/src/main/java/com/mirth/connect/server/migration/Migrator.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/Migrator.java rename to server/src/main/java/com/mirth/connect/server/migration/Migrator.java diff --git a/server/src/com/mirth/connect/server/migration/ResourceUtil.java b/server/src/main/java/com/mirth/connect/server/migration/ResourceUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/ResourceUtil.java rename to server/src/main/java/com/mirth/connect/server/migration/ResourceUtil.java diff --git a/server/src/com/mirth/connect/server/migration/ServerMigrator.java b/server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java similarity index 100% rename from server/src/com/mirth/connect/server/migration/ServerMigrator.java rename to server/src/main/java/com/mirth/connect/server/migration/ServerMigrator.java diff --git a/server/src/com/mirth/connect/server/mybatis/BridgeDataSourceFactory.java b/server/src/main/java/com/mirth/connect/server/mybatis/BridgeDataSourceFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/mybatis/BridgeDataSourceFactory.java rename to server/src/main/java/com/mirth/connect/server/mybatis/BridgeDataSourceFactory.java diff --git a/server/src/com/mirth/connect/server/mybatis/KeyValuePair.java b/server/src/main/java/com/mirth/connect/server/mybatis/KeyValuePair.java similarity index 100% rename from server/src/com/mirth/connect/server/mybatis/KeyValuePair.java rename to server/src/main/java/com/mirth/connect/server/mybatis/KeyValuePair.java diff --git a/server/src/com/mirth/connect/server/mybatis/MessageSearchResult.java b/server/src/main/java/com/mirth/connect/server/mybatis/MessageSearchResult.java similarity index 100% rename from server/src/com/mirth/connect/server/mybatis/MessageSearchResult.java rename to server/src/main/java/com/mirth/connect/server/mybatis/MessageSearchResult.java diff --git a/server/src/com/mirth/connect/server/mybatis/MessageTextResult.java b/server/src/main/java/com/mirth/connect/server/mybatis/MessageTextResult.java similarity index 100% rename from server/src/com/mirth/connect/server/mybatis/MessageTextResult.java rename to server/src/main/java/com/mirth/connect/server/mybatis/MessageTextResult.java diff --git a/server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java b/server/src/main/java/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java rename to server/src/main/java/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java diff --git a/server/src/com/mirth/connect/server/servlets/SwaggerServlet.java b/server/src/main/java/com/mirth/connect/server/servlets/SwaggerServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/servlets/SwaggerServlet.java rename to server/src/main/java/com/mirth/connect/server/servlets/SwaggerServlet.java diff --git a/server/src/com/mirth/connect/server/servlets/WebStartServlet.java b/server/src/main/java/com/mirth/connect/server/servlets/WebStartServlet.java similarity index 100% rename from server/src/com/mirth/connect/server/servlets/WebStartServlet.java rename to server/src/main/java/com/mirth/connect/server/servlets/WebStartServlet.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/CalendarTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CalendarTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/CalendarTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CalendarTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/ChannelGroupTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ChannelGroupTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/ChannelGroupTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ChannelGroupTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/ChannelTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ChannelTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/ChannelTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ChannelTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/CodeTemplateLibraryTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CodeTemplateLibraryTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/CodeTemplateLibraryTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CodeTemplateLibraryTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/CodeTemplateTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CodeTemplateTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/CodeTemplateTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/CodeTemplateTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/ContentTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ContentTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/ContentTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/ContentTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/EnumTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EnumTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/EnumTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EnumTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/EventLevelTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EventLevelTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/EventLevelTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EventLevelTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/EventOutcomeTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EventOutcomeTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/EventOutcomeTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/EventOutcomeTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/MapTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/MapTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/MapTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/MapTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/PropertiesTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/PropertiesTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/PropertiesTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/PropertiesTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/SerializedObjectTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/SerializedObjectTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/SerializedObjectTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/SerializedObjectTypeHandler.java diff --git a/server/src/com/mirth/connect/server/sqlmap/extensions/StatusTypeHandler.java b/server/src/main/java/com/mirth/connect/server/sqlmap/extensions/StatusTypeHandler.java similarity index 100% rename from server/src/com/mirth/connect/server/sqlmap/extensions/StatusTypeHandler.java rename to server/src/main/java/com/mirth/connect/server/sqlmap/extensions/StatusTypeHandler.java diff --git a/server/src/com/mirth/connect/server/tools/ClassPathResource.java b/server/src/main/java/com/mirth/connect/server/tools/ClassPathResource.java similarity index 100% rename from server/src/com/mirth/connect/server/tools/ClassPathResource.java rename to server/src/main/java/com/mirth/connect/server/tools/ClassPathResource.java diff --git a/server/src/com/mirth/connect/server/tools/ScriptRunner.java b/server/src/main/java/com/mirth/connect/server/tools/ScriptRunner.java similarity index 100% rename from server/src/com/mirth/connect/server/tools/ScriptRunner.java rename to server/src/main/java/com/mirth/connect/server/tools/ScriptRunner.java diff --git a/server/src/com/mirth/connect/server/transformers/InvalidTransformedDataException.java b/server/src/main/java/com/mirth/connect/server/transformers/InvalidTransformedDataException.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/InvalidTransformedDataException.java rename to server/src/main/java/com/mirth/connect/server/transformers/InvalidTransformedDataException.java diff --git a/server/src/com/mirth/connect/server/transformers/JavaScriptFilterTransformer.java b/server/src/main/java/com/mirth/connect/server/transformers/JavaScriptFilterTransformer.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/JavaScriptFilterTransformer.java rename to server/src/main/java/com/mirth/connect/server/transformers/JavaScriptFilterTransformer.java diff --git a/server/src/com/mirth/connect/server/transformers/JavaScriptInitializationException.java b/server/src/main/java/com/mirth/connect/server/transformers/JavaScriptInitializationException.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/JavaScriptInitializationException.java rename to server/src/main/java/com/mirth/connect/server/transformers/JavaScriptInitializationException.java diff --git a/server/src/com/mirth/connect/server/transformers/JavaScriptPostprocessor.java b/server/src/main/java/com/mirth/connect/server/transformers/JavaScriptPostprocessor.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/JavaScriptPostprocessor.java rename to server/src/main/java/com/mirth/connect/server/transformers/JavaScriptPostprocessor.java diff --git a/server/src/com/mirth/connect/server/transformers/JavaScriptPreprocessor.java b/server/src/main/java/com/mirth/connect/server/transformers/JavaScriptPreprocessor.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/JavaScriptPreprocessor.java rename to server/src/main/java/com/mirth/connect/server/transformers/JavaScriptPreprocessor.java diff --git a/server/src/com/mirth/connect/server/transformers/JavaScriptResponseTransformer.java b/server/src/main/java/com/mirth/connect/server/transformers/JavaScriptResponseTransformer.java similarity index 100% rename from server/src/com/mirth/connect/server/transformers/JavaScriptResponseTransformer.java rename to server/src/main/java/com/mirth/connect/server/transformers/JavaScriptResponseTransformer.java diff --git a/server/src/com/mirth/connect/server/userutil/ACKGenerator.java b/server/src/main/java/com/mirth/connect/server/userutil/ACKGenerator.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ACKGenerator.java rename to server/src/main/java/com/mirth/connect/server/userutil/ACKGenerator.java diff --git a/server/src/com/mirth/connect/server/userutil/AlertSender.java b/server/src/main/java/com/mirth/connect/server/userutil/AlertSender.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/AlertSender.java rename to server/src/main/java/com/mirth/connect/server/userutil/AlertSender.java diff --git a/server/src/com/mirth/connect/server/userutil/Attachment.java b/server/src/main/java/com/mirth/connect/server/userutil/Attachment.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/Attachment.java rename to server/src/main/java/com/mirth/connect/server/userutil/Attachment.java diff --git a/server/src/com/mirth/connect/server/userutil/AttachmentUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/AttachmentUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/AttachmentUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/AttachmentUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/ChannelMap.java b/server/src/main/java/com/mirth/connect/server/userutil/ChannelMap.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ChannelMap.java rename to server/src/main/java/com/mirth/connect/server/userutil/ChannelMap.java diff --git a/server/src/com/mirth/connect/server/userutil/ChannelUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/ChannelUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ChannelUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/ChannelUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/ContextFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ContextFactory.java rename to server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java diff --git a/server/src/com/mirth/connect/server/userutil/DICOMUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/DICOMUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DICOMUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/DICOMUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/DatabaseConnection.java b/server/src/main/java/com/mirth/connect/server/userutil/DatabaseConnection.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DatabaseConnection.java rename to server/src/main/java/com/mirth/connect/server/userutil/DatabaseConnection.java diff --git a/server/src/com/mirth/connect/server/userutil/DatabaseConnectionFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/DatabaseConnectionFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DatabaseConnectionFactory.java rename to server/src/main/java/com/mirth/connect/server/userutil/DatabaseConnectionFactory.java diff --git a/server/src/com/mirth/connect/server/userutil/DateUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/DateUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DateUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/DateUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/DeployedState.java b/server/src/main/java/com/mirth/connect/server/userutil/DeployedState.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DeployedState.java rename to server/src/main/java/com/mirth/connect/server/userutil/DeployedState.java diff --git a/server/src/com/mirth/connect/server/userutil/DestinationSet.java b/server/src/main/java/com/mirth/connect/server/userutil/DestinationSet.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/DestinationSet.java rename to server/src/main/java/com/mirth/connect/server/userutil/DestinationSet.java diff --git a/server/src/com/mirth/connect/server/userutil/EncryptedData.java b/server/src/main/java/com/mirth/connect/server/userutil/EncryptedData.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/EncryptedData.java rename to server/src/main/java/com/mirth/connect/server/userutil/EncryptedData.java diff --git a/server/src/com/mirth/connect/server/userutil/EncryptionUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/EncryptionUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/EncryptionUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/EncryptionUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/FileUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/FileUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/FileUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/FileUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/Future.java b/server/src/main/java/com/mirth/connect/server/userutil/Future.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/Future.java rename to server/src/main/java/com/mirth/connect/server/userutil/Future.java diff --git a/server/src/com/mirth/connect/server/userutil/HTTPUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/HTTPUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/HTTPUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/HTTPUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/HashUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/HashUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/HashUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/HashUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/ImmutableResponse.java b/server/src/main/java/com/mirth/connect/server/userutil/ImmutableResponse.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ImmutableResponse.java rename to server/src/main/java/com/mirth/connect/server/userutil/ImmutableResponse.java diff --git a/server/src/com/mirth/connect/server/userutil/MirthCachedRowSet.java b/server/src/main/java/com/mirth/connect/server/userutil/MirthCachedRowSet.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/MirthCachedRowSet.java rename to server/src/main/java/com/mirth/connect/server/userutil/MirthCachedRowSet.java diff --git a/server/src/com/mirth/connect/server/userutil/NCPDPUtil.java b/server/src/main/java/com/mirth/connect/server/userutil/NCPDPUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/NCPDPUtil.java rename to server/src/main/java/com/mirth/connect/server/userutil/NCPDPUtil.java diff --git a/server/src/com/mirth/connect/server/userutil/RawMessage.java b/server/src/main/java/com/mirth/connect/server/userutil/RawMessage.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/RawMessage.java rename to server/src/main/java/com/mirth/connect/server/userutil/RawMessage.java diff --git a/server/src/com/mirth/connect/server/userutil/ResponseFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/ResponseFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/ResponseFactory.java rename to server/src/main/java/com/mirth/connect/server/userutil/ResponseFactory.java diff --git a/server/src/com/mirth/connect/server/userutil/SMTPConnection.java b/server/src/main/java/com/mirth/connect/server/userutil/SMTPConnection.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/SMTPConnection.java rename to server/src/main/java/com/mirth/connect/server/userutil/SMTPConnection.java diff --git a/server/src/com/mirth/connect/server/userutil/SMTPConnectionFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/SMTPConnectionFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/SMTPConnectionFactory.java rename to server/src/main/java/com/mirth/connect/server/userutil/SMTPConnectionFactory.java diff --git a/server/src/com/mirth/connect/server/userutil/SerializerFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/SerializerFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/SerializerFactory.java rename to server/src/main/java/com/mirth/connect/server/userutil/SerializerFactory.java diff --git a/server/src/com/mirth/connect/server/userutil/SourceMap.java b/server/src/main/java/com/mirth/connect/server/userutil/SourceMap.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/SourceMap.java rename to server/src/main/java/com/mirth/connect/server/userutil/SourceMap.java diff --git a/server/src/com/mirth/connect/server/userutil/UUIDGenerator.java b/server/src/main/java/com/mirth/connect/server/userutil/UUIDGenerator.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/UUIDGenerator.java rename to server/src/main/java/com/mirth/connect/server/userutil/UUIDGenerator.java diff --git a/server/src/com/mirth/connect/server/userutil/VMRouter.java b/server/src/main/java/com/mirth/connect/server/userutil/VMRouter.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/VMRouter.java rename to server/src/main/java/com/mirth/connect/server/userutil/VMRouter.java diff --git a/server/src/com/mirth/connect/server/userutil/package-info.java b/server/src/main/java/com/mirth/connect/server/userutil/package-info.java similarity index 100% rename from server/src/com/mirth/connect/server/userutil/package-info.java rename to server/src/main/java/com/mirth/connect/server/userutil/package-info.java diff --git a/server/src/com/mirth/connect/server/util/ChannelDependencyServerUtil.java b/server/src/main/java/com/mirth/connect/server/util/ChannelDependencyServerUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ChannelDependencyServerUtil.java rename to server/src/main/java/com/mirth/connect/server/util/ChannelDependencyServerUtil.java diff --git a/server/src/com/mirth/connect/server/util/ChildFirstURLClassLoader.java b/server/src/main/java/com/mirth/connect/server/util/ChildFirstURLClassLoader.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ChildFirstURLClassLoader.java rename to server/src/main/java/com/mirth/connect/server/util/ChildFirstURLClassLoader.java diff --git a/server/src/com/mirth/connect/server/util/CompiledScriptCache.java b/server/src/main/java/com/mirth/connect/server/util/CompiledScriptCache.java similarity index 100% rename from server/src/com/mirth/connect/server/util/CompiledScriptCache.java rename to server/src/main/java/com/mirth/connect/server/util/CompiledScriptCache.java diff --git a/server/src/com/mirth/connect/server/util/ConnectorUtil.java b/server/src/main/java/com/mirth/connect/server/util/ConnectorUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ConnectorUtil.java rename to server/src/main/java/com/mirth/connect/server/util/ConnectorUtil.java diff --git a/server/src/com/mirth/connect/server/util/DICOMMessageUtil.java b/server/src/main/java/com/mirth/connect/server/util/DICOMMessageUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/DICOMMessageUtil.java rename to server/src/main/java/com/mirth/connect/server/util/DICOMMessageUtil.java diff --git a/server/src/com/mirth/connect/server/util/DatabaseUtil.java b/server/src/main/java/com/mirth/connect/server/util/DatabaseUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/DatabaseUtil.java rename to server/src/main/java/com/mirth/connect/server/util/DatabaseUtil.java diff --git a/server/src/com/mirth/connect/server/util/DebuggerUtil.java b/server/src/main/java/com/mirth/connect/server/util/DebuggerUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/DebuggerUtil.java rename to server/src/main/java/com/mirth/connect/server/util/DebuggerUtil.java diff --git a/server/src/com/mirth/connect/server/util/GlobalChannelVariableStore.java b/server/src/main/java/com/mirth/connect/server/util/GlobalChannelVariableStore.java similarity index 100% rename from server/src/com/mirth/connect/server/util/GlobalChannelVariableStore.java rename to server/src/main/java/com/mirth/connect/server/util/GlobalChannelVariableStore.java diff --git a/server/src/com/mirth/connect/server/util/GlobalChannelVariableStoreFactory.java b/server/src/main/java/com/mirth/connect/server/util/GlobalChannelVariableStoreFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/util/GlobalChannelVariableStoreFactory.java rename to server/src/main/java/com/mirth/connect/server/util/GlobalChannelVariableStoreFactory.java diff --git a/server/src/com/mirth/connect/server/util/GlobalVariableStore.java b/server/src/main/java/com/mirth/connect/server/util/GlobalVariableStore.java similarity index 100% rename from server/src/com/mirth/connect/server/util/GlobalVariableStore.java rename to server/src/main/java/com/mirth/connect/server/util/GlobalVariableStore.java diff --git a/server/src/com/mirth/connect/server/util/ListRangeIterator.java b/server/src/main/java/com/mirth/connect/server/util/ListRangeIterator.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ListRangeIterator.java rename to server/src/main/java/com/mirth/connect/server/util/ListRangeIterator.java diff --git a/server/src/com/mirth/connect/server/util/LoginRequirementsChecker.java b/server/src/main/java/com/mirth/connect/server/util/LoginRequirementsChecker.java similarity index 100% rename from server/src/com/mirth/connect/server/util/LoginRequirementsChecker.java rename to server/src/main/java/com/mirth/connect/server/util/LoginRequirementsChecker.java diff --git a/server/src/com/mirth/connect/server/util/NetworkUtil.java b/server/src/main/java/com/mirth/connect/server/util/NetworkUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/NetworkUtil.java rename to server/src/main/java/com/mirth/connect/server/util/NetworkUtil.java diff --git a/server/src/com/mirth/connect/server/util/OAuthCredentials.java b/server/src/main/java/com/mirth/connect/server/util/OAuthCredentials.java similarity index 100% rename from server/src/com/mirth/connect/server/util/OAuthCredentials.java rename to server/src/main/java/com/mirth/connect/server/util/OAuthCredentials.java diff --git a/server/src/com/mirth/connect/server/util/PackagePredicate.java b/server/src/main/java/com/mirth/connect/server/util/PackagePredicate.java similarity index 100% rename from server/src/com/mirth/connect/server/util/PackagePredicate.java rename to server/src/main/java/com/mirth/connect/server/util/PackagePredicate.java diff --git a/server/src/com/mirth/connect/server/util/PasswordRequirementsChecker.java b/server/src/main/java/com/mirth/connect/server/util/PasswordRequirementsChecker.java similarity index 100% rename from server/src/com/mirth/connect/server/util/PasswordRequirementsChecker.java rename to server/src/main/java/com/mirth/connect/server/util/PasswordRequirementsChecker.java diff --git a/server/src/com/mirth/connect/server/util/Pre22PasswordChecker.java b/server/src/main/java/com/mirth/connect/server/util/Pre22PasswordChecker.java similarity index 100% rename from server/src/com/mirth/connect/server/util/Pre22PasswordChecker.java rename to server/src/main/java/com/mirth/connect/server/util/Pre22PasswordChecker.java diff --git a/server/src/com/mirth/connect/server/util/ResourceUtil.java b/server/src/main/java/com/mirth/connect/server/util/ResourceUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ResourceUtil.java rename to server/src/main/java/com/mirth/connect/server/util/ResourceUtil.java diff --git a/server/src/com/mirth/connect/server/util/ServerSMTPConnection.java b/server/src/main/java/com/mirth/connect/server/util/ServerSMTPConnection.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ServerSMTPConnection.java rename to server/src/main/java/com/mirth/connect/server/util/ServerSMTPConnection.java diff --git a/server/src/com/mirth/connect/server/util/ServerSMTPConnectionFactory.java b/server/src/main/java/com/mirth/connect/server/util/ServerSMTPConnectionFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ServerSMTPConnectionFactory.java rename to server/src/main/java/com/mirth/connect/server/util/ServerSMTPConnectionFactory.java diff --git a/server/src/com/mirth/connect/server/util/ServerUUIDGenerator.java b/server/src/main/java/com/mirth/connect/server/util/ServerUUIDGenerator.java similarity index 100% rename from server/src/com/mirth/connect/server/util/ServerUUIDGenerator.java rename to server/src/main/java/com/mirth/connect/server/util/ServerUUIDGenerator.java diff --git a/server/src/com/mirth/connect/server/util/SqlConfig.java b/server/src/main/java/com/mirth/connect/server/util/SqlConfig.java similarity index 100% rename from server/src/com/mirth/connect/server/util/SqlConfig.java rename to server/src/main/java/com/mirth/connect/server/util/SqlConfig.java diff --git a/server/src/com/mirth/connect/server/util/StatementLock.java b/server/src/main/java/com/mirth/connect/server/util/StatementLock.java similarity index 100% rename from server/src/com/mirth/connect/server/util/StatementLock.java rename to server/src/main/java/com/mirth/connect/server/util/StatementLock.java diff --git a/server/src/com/mirth/connect/server/util/SyncObject.java b/server/src/main/java/com/mirth/connect/server/util/SyncObject.java similarity index 100% rename from server/src/com/mirth/connect/server/util/SyncObject.java rename to server/src/main/java/com/mirth/connect/server/util/SyncObject.java diff --git a/server/src/com/mirth/connect/server/util/TemplateValueReplacer.java b/server/src/main/java/com/mirth/connect/server/util/TemplateValueReplacer.java similarity index 100% rename from server/src/com/mirth/connect/server/util/TemplateValueReplacer.java rename to server/src/main/java/com/mirth/connect/server/util/TemplateValueReplacer.java diff --git a/server/src/com/mirth/connect/server/util/UserSessionCache.java b/server/src/main/java/com/mirth/connect/server/util/UserSessionCache.java similarity index 100% rename from server/src/com/mirth/connect/server/util/UserSessionCache.java rename to server/src/main/java/com/mirth/connect/server/util/UserSessionCache.java diff --git a/server/src/com/mirth/connect/server/util/javascript/JavaScriptExecutorException.java b/server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptExecutorException.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/JavaScriptExecutorException.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptExecutorException.java diff --git a/server/src/com/mirth/connect/server/util/javascript/JavaScriptScopeUtil.java b/server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptScopeUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/JavaScriptScopeUtil.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptScopeUtil.java diff --git a/server/src/com/mirth/connect/server/util/javascript/JavaScriptTask.java b/server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptTask.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/JavaScriptTask.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptTask.java diff --git a/server/src/com/mirth/connect/server/util/javascript/JavaScriptUtil.java b/server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptUtil.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/JavaScriptUtil.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/JavaScriptUtil.java diff --git a/server/src/com/mirth/connect/server/util/javascript/MirthContext.java b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContext.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/MirthContext.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/MirthContext.java diff --git a/server/src/com/mirth/connect/server/util/javascript/MirthContextFactory.java b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/MirthContextFactory.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java diff --git a/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThread.java b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthJavaScriptThread.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThread.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/MirthJavaScriptThread.java diff --git a/server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java similarity index 100% rename from server/src/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java rename to server/src/main/java/com/mirth/connect/server/util/javascript/MirthJavaScriptThreadFactory.java diff --git a/server/src/com/mirth/connect/userutil/AttachmentEntry.java b/server/src/main/java/com/mirth/connect/userutil/AttachmentEntry.java similarity index 100% rename from server/src/com/mirth/connect/userutil/AttachmentEntry.java rename to server/src/main/java/com/mirth/connect/userutil/AttachmentEntry.java diff --git a/server/src/com/mirth/connect/userutil/ContentType.java b/server/src/main/java/com/mirth/connect/userutil/ContentType.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ContentType.java rename to server/src/main/java/com/mirth/connect/userutil/ContentType.java diff --git a/server/src/com/mirth/connect/userutil/ImmutableAttachment.java b/server/src/main/java/com/mirth/connect/userutil/ImmutableAttachment.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ImmutableAttachment.java rename to server/src/main/java/com/mirth/connect/userutil/ImmutableAttachment.java diff --git a/server/src/com/mirth/connect/userutil/ImmutableConnectorMessage.java b/server/src/main/java/com/mirth/connect/userutil/ImmutableConnectorMessage.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ImmutableConnectorMessage.java rename to server/src/main/java/com/mirth/connect/userutil/ImmutableConnectorMessage.java diff --git a/server/src/com/mirth/connect/userutil/ImmutableMessage.java b/server/src/main/java/com/mirth/connect/userutil/ImmutableMessage.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ImmutableMessage.java rename to server/src/main/java/com/mirth/connect/userutil/ImmutableMessage.java diff --git a/server/src/com/mirth/connect/userutil/ImmutableMessageContent.java b/server/src/main/java/com/mirth/connect/userutil/ImmutableMessageContent.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ImmutableMessageContent.java rename to server/src/main/java/com/mirth/connect/userutil/ImmutableMessageContent.java diff --git a/server/src/com/mirth/connect/userutil/JsonUtil.java b/server/src/main/java/com/mirth/connect/userutil/JsonUtil.java similarity index 100% rename from server/src/com/mirth/connect/userutil/JsonUtil.java rename to server/src/main/java/com/mirth/connect/userutil/JsonUtil.java diff --git a/server/src/com/mirth/connect/userutil/ListBuilder.java b/server/src/main/java/com/mirth/connect/userutil/ListBuilder.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ListBuilder.java rename to server/src/main/java/com/mirth/connect/userutil/ListBuilder.java diff --git a/server/src/com/mirth/connect/userutil/Lists.java b/server/src/main/java/com/mirth/connect/userutil/Lists.java similarity index 100% rename from server/src/com/mirth/connect/userutil/Lists.java rename to server/src/main/java/com/mirth/connect/userutil/Lists.java diff --git a/server/src/com/mirth/connect/userutil/MapBuilder.java b/server/src/main/java/com/mirth/connect/userutil/MapBuilder.java similarity index 100% rename from server/src/com/mirth/connect/userutil/MapBuilder.java rename to server/src/main/java/com/mirth/connect/userutil/MapBuilder.java diff --git a/server/src/com/mirth/connect/userutil/Maps.java b/server/src/main/java/com/mirth/connect/userutil/Maps.java similarity index 100% rename from server/src/com/mirth/connect/userutil/Maps.java rename to server/src/main/java/com/mirth/connect/userutil/Maps.java diff --git a/server/src/com/mirth/connect/userutil/MessageHeaders.java b/server/src/main/java/com/mirth/connect/userutil/MessageHeaders.java similarity index 100% rename from server/src/com/mirth/connect/userutil/MessageHeaders.java rename to server/src/main/java/com/mirth/connect/userutil/MessageHeaders.java diff --git a/server/src/com/mirth/connect/userutil/MessageParameters.java b/server/src/main/java/com/mirth/connect/userutil/MessageParameters.java similarity index 100% rename from server/src/com/mirth/connect/userutil/MessageParameters.java rename to server/src/main/java/com/mirth/connect/userutil/MessageParameters.java diff --git a/server/src/com/mirth/connect/userutil/Response.java b/server/src/main/java/com/mirth/connect/userutil/Response.java similarity index 100% rename from server/src/com/mirth/connect/userutil/Response.java rename to server/src/main/java/com/mirth/connect/userutil/Response.java diff --git a/server/src/com/mirth/connect/userutil/ResponseMap.java b/server/src/main/java/com/mirth/connect/userutil/ResponseMap.java similarity index 100% rename from server/src/com/mirth/connect/userutil/ResponseMap.java rename to server/src/main/java/com/mirth/connect/userutil/ResponseMap.java diff --git a/server/src/com/mirth/connect/userutil/Status.java b/server/src/main/java/com/mirth/connect/userutil/Status.java similarity index 100% rename from server/src/com/mirth/connect/userutil/Status.java rename to server/src/main/java/com/mirth/connect/userutil/Status.java diff --git a/server/src/com/mirth/connect/userutil/XmlUtil.java b/server/src/main/java/com/mirth/connect/userutil/XmlUtil.java similarity index 100% rename from server/src/com/mirth/connect/userutil/XmlUtil.java rename to server/src/main/java/com/mirth/connect/userutil/XmlUtil.java diff --git a/server/src/com/mirth/connect/userutil/package-info.java b/server/src/main/java/com/mirth/connect/userutil/package-info.java similarity index 100% rename from server/src/com/mirth/connect/userutil/package-info.java rename to server/src/main/java/com/mirth/connect/userutil/package-info.java diff --git a/server/src/com/mirth/connect/util/ArchiveUtils.java b/server/src/main/java/com/mirth/connect/util/ArchiveUtils.java similarity index 100% rename from server/src/com/mirth/connect/util/ArchiveUtils.java rename to server/src/main/java/com/mirth/connect/util/ArchiveUtils.java diff --git a/server/src/com/mirth/connect/util/AttachmentUtil.java b/server/src/main/java/com/mirth/connect/util/AttachmentUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/AttachmentUtil.java rename to server/src/main/java/com/mirth/connect/util/AttachmentUtil.java diff --git a/server/src/com/mirth/connect/util/BeanUtil.java b/server/src/main/java/com/mirth/connect/util/BeanUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/BeanUtil.java rename to server/src/main/java/com/mirth/connect/util/BeanUtil.java diff --git a/server/src/com/mirth/connect/util/ChannelDependencyException.java b/server/src/main/java/com/mirth/connect/util/ChannelDependencyException.java similarity index 100% rename from server/src/com/mirth/connect/util/ChannelDependencyException.java rename to server/src/main/java/com/mirth/connect/util/ChannelDependencyException.java diff --git a/server/src/com/mirth/connect/util/ChannelDependencyGraph.java b/server/src/main/java/com/mirth/connect/util/ChannelDependencyGraph.java similarity index 100% rename from server/src/com/mirth/connect/util/ChannelDependencyGraph.java rename to server/src/main/java/com/mirth/connect/util/ChannelDependencyGraph.java diff --git a/server/src/com/mirth/connect/util/ChannelDependencyUtil.java b/server/src/main/java/com/mirth/connect/util/ChannelDependencyUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/ChannelDependencyUtil.java rename to server/src/main/java/com/mirth/connect/util/ChannelDependencyUtil.java diff --git a/server/src/com/mirth/connect/util/CharsetUtils.java b/server/src/main/java/com/mirth/connect/util/CharsetUtils.java similarity index 100% rename from server/src/com/mirth/connect/util/CharsetUtils.java rename to server/src/main/java/com/mirth/connect/util/CharsetUtils.java diff --git a/server/src/com/mirth/connect/util/CodeTemplateUtil.java b/server/src/main/java/com/mirth/connect/util/CodeTemplateUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/CodeTemplateUtil.java rename to server/src/main/java/com/mirth/connect/util/CodeTemplateUtil.java diff --git a/server/src/com/mirth/connect/util/ColorUtil.java b/server/src/main/java/com/mirth/connect/util/ColorUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/ColorUtil.java rename to server/src/main/java/com/mirth/connect/util/ColorUtil.java diff --git a/server/src/com/mirth/connect/util/ConfigurationProperty.java b/server/src/main/java/com/mirth/connect/util/ConfigurationProperty.java similarity index 100% rename from server/src/com/mirth/connect/util/ConfigurationProperty.java rename to server/src/main/java/com/mirth/connect/util/ConfigurationProperty.java diff --git a/server/src/com/mirth/connect/util/ConnectionTestResponse.java b/server/src/main/java/com/mirth/connect/util/ConnectionTestResponse.java similarity index 100% rename from server/src/com/mirth/connect/util/ConnectionTestResponse.java rename to server/src/main/java/com/mirth/connect/util/ConnectionTestResponse.java diff --git a/server/src/com/mirth/connect/util/DirectedAcyclicGraph.java b/server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraph.java similarity index 100% rename from server/src/com/mirth/connect/util/DirectedAcyclicGraph.java rename to server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraph.java diff --git a/server/src/com/mirth/connect/util/DirectedAcyclicGraphException.java b/server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraphException.java similarity index 100% rename from server/src/com/mirth/connect/util/DirectedAcyclicGraphException.java rename to server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraphException.java diff --git a/server/src/com/mirth/connect/util/DirectedAcyclicGraphNode.java b/server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraphNode.java similarity index 100% rename from server/src/com/mirth/connect/util/DirectedAcyclicGraphNode.java rename to server/src/main/java/com/mirth/connect/util/DirectedAcyclicGraphNode.java diff --git a/server/src/com/mirth/connect/util/EXPORTREADME.txt b/server/src/main/java/com/mirth/connect/util/EXPORTREADME.txt similarity index 100% rename from server/src/com/mirth/connect/util/EXPORTREADME.txt rename to server/src/main/java/com/mirth/connect/util/EXPORTREADME.txt diff --git a/server/src/com/mirth/connect/util/ErrorMessageBuilder.java b/server/src/main/java/com/mirth/connect/util/ErrorMessageBuilder.java similarity index 100% rename from server/src/com/mirth/connect/util/ErrorMessageBuilder.java rename to server/src/main/java/com/mirth/connect/util/ErrorMessageBuilder.java diff --git a/server/src/com/mirth/connect/util/FilenameUtils.java b/server/src/main/java/com/mirth/connect/util/FilenameUtils.java similarity index 100% rename from server/src/com/mirth/connect/util/FilenameUtils.java rename to server/src/main/java/com/mirth/connect/util/FilenameUtils.java diff --git a/server/src/com/mirth/connect/util/HttpUtil.java b/server/src/main/java/com/mirth/connect/util/HttpUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/HttpUtil.java rename to server/src/main/java/com/mirth/connect/util/HttpUtil.java diff --git a/server/src/com/mirth/connect/util/JavaScriptSharedUtil.java b/server/src/main/java/com/mirth/connect/util/JavaScriptSharedUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/JavaScriptSharedUtil.java rename to server/src/main/java/com/mirth/connect/util/JavaScriptSharedUtil.java diff --git a/server/src/com/mirth/connect/util/JsonXmlUtil.java b/server/src/main/java/com/mirth/connect/util/JsonXmlUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/JsonXmlUtil.java rename to server/src/main/java/com/mirth/connect/util/JsonXmlUtil.java diff --git a/server/src/com/mirth/connect/util/MessageEncryptionUtil.java b/server/src/main/java/com/mirth/connect/util/MessageEncryptionUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/MessageEncryptionUtil.java rename to server/src/main/java/com/mirth/connect/util/MessageEncryptionUtil.java diff --git a/server/src/com/mirth/connect/util/MessageExporter.java b/server/src/main/java/com/mirth/connect/util/MessageExporter.java similarity index 100% rename from server/src/com/mirth/connect/util/MessageExporter.java rename to server/src/main/java/com/mirth/connect/util/MessageExporter.java diff --git a/server/src/com/mirth/connect/util/MessageImporter.java b/server/src/main/java/com/mirth/connect/util/MessageImporter.java similarity index 100% rename from server/src/com/mirth/connect/util/MessageImporter.java rename to server/src/main/java/com/mirth/connect/util/MessageImporter.java diff --git a/server/src/com/mirth/connect/util/MigrationUtil.java b/server/src/main/java/com/mirth/connect/util/MigrationUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/MigrationUtil.java rename to server/src/main/java/com/mirth/connect/util/MigrationUtil.java diff --git a/server/src/com/mirth/connect/util/MirthJsonUtil.java b/server/src/main/java/com/mirth/connect/util/MirthJsonUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/MirthJsonUtil.java rename to server/src/main/java/com/mirth/connect/util/MirthJsonUtil.java diff --git a/server/src/com/mirth/connect/util/MirthSSLUtil.java b/server/src/main/java/com/mirth/connect/util/MirthSSLUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/MirthSSLUtil.java rename to server/src/main/java/com/mirth/connect/util/MirthSSLUtil.java diff --git a/server/src/com/mirth/connect/util/MirthXmlUtil.java b/server/src/main/java/com/mirth/connect/util/MirthXmlUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/MirthXmlUtil.java rename to server/src/main/java/com/mirth/connect/util/MirthXmlUtil.java diff --git a/server/src/com/mirth/connect/util/PaginatedList.java b/server/src/main/java/com/mirth/connect/util/PaginatedList.java similarity index 100% rename from server/src/com/mirth/connect/util/PaginatedList.java rename to server/src/main/java/com/mirth/connect/util/PaginatedList.java diff --git a/server/src/com/mirth/connect/util/PropertyLoader.java b/server/src/main/java/com/mirth/connect/util/PropertyLoader.java similarity index 100% rename from server/src/com/mirth/connect/util/PropertyLoader.java rename to server/src/main/java/com/mirth/connect/util/PropertyLoader.java diff --git a/server/src/com/mirth/connect/util/PropertyVerifier.java b/server/src/main/java/com/mirth/connect/util/PropertyVerifier.java similarity index 100% rename from server/src/com/mirth/connect/util/PropertyVerifier.java rename to server/src/main/java/com/mirth/connect/util/PropertyVerifier.java diff --git a/server/src/com/mirth/connect/util/ScriptBuilderException.java b/server/src/main/java/com/mirth/connect/util/ScriptBuilderException.java similarity index 100% rename from server/src/com/mirth/connect/util/ScriptBuilderException.java rename to server/src/main/java/com/mirth/connect/util/ScriptBuilderException.java diff --git a/server/src/com/mirth/connect/util/StringUtil.java b/server/src/main/java/com/mirth/connect/util/StringUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/StringUtil.java rename to server/src/main/java/com/mirth/connect/util/StringUtil.java diff --git a/server/src/com/mirth/connect/util/TcpUtil.java b/server/src/main/java/com/mirth/connect/util/TcpUtil.java similarity index 100% rename from server/src/com/mirth/connect/util/TcpUtil.java rename to server/src/main/java/com/mirth/connect/util/TcpUtil.java diff --git a/server/src/com/mirth/connect/util/ValueReplacer.java b/server/src/main/java/com/mirth/connect/util/ValueReplacer.java similarity index 100% rename from server/src/com/mirth/connect/util/ValueReplacer.java rename to server/src/main/java/com/mirth/connect/util/ValueReplacer.java diff --git a/server/src/com/mirth/connect/util/VfsUtils.java b/server/src/main/java/com/mirth/connect/util/VfsUtils.java similarity index 100% rename from server/src/com/mirth/connect/util/VfsUtils.java rename to server/src/main/java/com/mirth/connect/util/VfsUtils.java diff --git a/server/src/com/mirth/connect/util/beautify-1.6.8.js b/server/src/main/java/com/mirth/connect/util/beautify-1.6.8.js similarity index 100% rename from server/src/com/mirth/connect/util/beautify-1.6.8.js rename to server/src/main/java/com/mirth/connect/util/beautify-1.6.8.js diff --git a/server/src/com/mirth/connect/util/messagewriter/AttachmentSource.java b/server/src/main/java/com/mirth/connect/util/messagewriter/AttachmentSource.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/AttachmentSource.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/AttachmentSource.java diff --git a/server/src/com/mirth/connect/util/messagewriter/EncryptionType.java b/server/src/main/java/com/mirth/connect/util/messagewriter/EncryptionType.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/EncryptionType.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/EncryptionType.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriter.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriter.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriter.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriter.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriterArchive.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterArchive.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriterArchive.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterArchive.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriterException.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterException.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriterException.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterException.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriterFactory.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterFactory.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriterFactory.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterFactory.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriterFile.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterFile.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriterFile.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterFile.java diff --git a/server/src/com/mirth/connect/util/messagewriter/MessageWriterOptions.java b/server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterOptions.java similarity index 100% rename from server/src/com/mirth/connect/util/messagewriter/MessageWriterOptions.java rename to server/src/main/java/com/mirth/connect/util/messagewriter/MessageWriterOptions.java diff --git a/server/src/de/odysseus/staxon/json/JsonXMLInputFactory.java b/server/src/main/java/de/odysseus/staxon/json/JsonXMLInputFactory.java similarity index 100% rename from server/src/de/odysseus/staxon/json/JsonXMLInputFactory.java rename to server/src/main/java/de/odysseus/staxon/json/JsonXMLInputFactory.java diff --git a/server/src/de/odysseus/staxon/json/JsonXMLOutputFactory.java b/server/src/main/java/de/odysseus/staxon/json/JsonXMLOutputFactory.java similarity index 100% rename from server/src/de/odysseus/staxon/json/JsonXMLOutputFactory.java rename to server/src/main/java/de/odysseus/staxon/json/JsonXMLOutputFactory.java diff --git a/server/src/de/odysseus/staxon/json/JsonXMLStreamReader.java b/server/src/main/java/de/odysseus/staxon/json/JsonXMLStreamReader.java similarity index 100% rename from server/src/de/odysseus/staxon/json/JsonXMLStreamReader.java rename to server/src/main/java/de/odysseus/staxon/json/JsonXMLStreamReader.java diff --git a/server/src/de/odysseus/staxon/json/JsonXMLStreamWriter.java b/server/src/main/java/de/odysseus/staxon/json/JsonXMLStreamWriter.java similarity index 100% rename from server/src/de/odysseus/staxon/json/JsonXMLStreamWriter.java rename to server/src/main/java/de/odysseus/staxon/json/JsonXMLStreamWriter.java diff --git a/server/src/de/odysseus/staxon/json/stream/util/MirthArrayTarget.java b/server/src/main/java/de/odysseus/staxon/json/stream/util/MirthArrayTarget.java similarity index 100% rename from server/src/de/odysseus/staxon/json/stream/util/MirthArrayTarget.java rename to server/src/main/java/de/odysseus/staxon/json/stream/util/MirthArrayTarget.java diff --git a/server/src/net/lingala/zip4j/unzip/Unzip.java b/server/src/main/java/net/lingala/zip4j/unzip/Unzip.java similarity index 100% rename from server/src/net/lingala/zip4j/unzip/Unzip.java rename to server/src/main/java/net/lingala/zip4j/unzip/Unzip.java diff --git a/server/src/net/lingala/zip4j/unzip/UnzipEngine.java b/server/src/main/java/net/lingala/zip4j/unzip/UnzipEngine.java similarity index 100% rename from server/src/net/lingala/zip4j/unzip/UnzipEngine.java rename to server/src/main/java/net/lingala/zip4j/unzip/UnzipEngine.java diff --git a/server/src/net/sourceforge/jtds/ssl/TdsTlsOutputStream.java b/server/src/main/java/net/sourceforge/jtds/ssl/TdsTlsOutputStream.java similarity index 100% rename from server/src/net/sourceforge/jtds/ssl/TdsTlsOutputStream.java rename to server/src/main/java/net/sourceforge/jtds/ssl/TdsTlsOutputStream.java diff --git a/server/src/org/dcm4che2/tool/dcmrcv/DcmRcv.java b/server/src/main/java/org/dcm4che2/tool/dcmrcv/DcmRcv.java similarity index 100% rename from server/src/org/dcm4che2/tool/dcmrcv/DcmRcv.java rename to server/src/main/java/org/dcm4che2/tool/dcmrcv/DcmRcv.java diff --git a/server/src/org/dcm4che2/tool/dcmrcv/MirthDcmRcv.java b/server/src/main/java/org/dcm4che2/tool/dcmrcv/MirthDcmRcv.java similarity index 100% rename from server/src/org/dcm4che2/tool/dcmrcv/MirthDcmRcv.java rename to server/src/main/java/org/dcm4che2/tool/dcmrcv/MirthDcmRcv.java diff --git a/server/src/org/dcm4che2/tool/dcmsnd/CustomDimseRSPHandler.java b/server/src/main/java/org/dcm4che2/tool/dcmsnd/CustomDimseRSPHandler.java similarity index 100% rename from server/src/org/dcm4che2/tool/dcmsnd/CustomDimseRSPHandler.java rename to server/src/main/java/org/dcm4che2/tool/dcmsnd/CustomDimseRSPHandler.java diff --git a/server/src/org/dcm4che2/tool/dcmsnd/DcmSnd.java b/server/src/main/java/org/dcm4che2/tool/dcmsnd/DcmSnd.java similarity index 100% rename from server/src/org/dcm4che2/tool/dcmsnd/DcmSnd.java rename to server/src/main/java/org/dcm4che2/tool/dcmsnd/DcmSnd.java diff --git a/server/src/org/dcm4che2/tool/dcmsnd/MirthDcmSnd.java b/server/src/main/java/org/dcm4che2/tool/dcmsnd/MirthDcmSnd.java similarity index 100% rename from server/src/org/dcm4che2/tool/dcmsnd/MirthDcmSnd.java rename to server/src/main/java/org/dcm4che2/tool/dcmsnd/MirthDcmSnd.java diff --git a/server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java b/server/src/main/java/org/glassfish/jersey/client/proxy/WebResourceFactory.java similarity index 100% rename from server/src/org/glassfish/jersey/client/proxy/WebResourceFactory.java rename to server/src/main/java/org/glassfish/jersey/client/proxy/WebResourceFactory.java diff --git a/server/src/org/mozilla/javascript/NativeBoolean.java b/server/src/main/java/org/mozilla/javascript/NativeBoolean.java similarity index 100% rename from server/src/org/mozilla/javascript/NativeBoolean.java rename to server/src/main/java/org/mozilla/javascript/NativeBoolean.java diff --git a/server/src/org/mozilla/javascript/NativeDate.java b/server/src/main/java/org/mozilla/javascript/NativeDate.java similarity index 100% rename from server/src/org/mozilla/javascript/NativeDate.java rename to server/src/main/java/org/mozilla/javascript/NativeDate.java diff --git a/server/src/org/mozilla/javascript/NativeJSON.java b/server/src/main/java/org/mozilla/javascript/NativeJSON.java similarity index 100% rename from server/src/org/mozilla/javascript/NativeJSON.java rename to server/src/main/java/org/mozilla/javascript/NativeJSON.java diff --git a/server/src/org/mozilla/javascript/NativeJavaObject.java b/server/src/main/java/org/mozilla/javascript/NativeJavaObject.java similarity index 100% rename from server/src/org/mozilla/javascript/NativeJavaObject.java rename to server/src/main/java/org/mozilla/javascript/NativeJavaObject.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/Dim.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/Dim.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/Dim.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/Dim.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/Main.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/Main.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/Main.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/Main.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/MirthDim.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/MirthDim.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/MirthDim.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/MirthDim.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/MirthMain.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/MirthMain.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/MirthMain.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/MirthMain.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/MirthSwingGui.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/MirthSwingGui.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/MirthSwingGui.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/MirthSwingGui.java diff --git a/server/src/org/mozilla/javascript/tools/debugger/SwingGui.java b/server/src/main/java/org/mozilla/javascript/tools/debugger/SwingGui.java similarity index 100% rename from server/src/org/mozilla/javascript/tools/debugger/SwingGui.java rename to server/src/main/java/org/mozilla/javascript/tools/debugger/SwingGui.java diff --git a/server/src/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java b/server/src/main/java/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java similarity index 100% rename from server/src/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java rename to server/src/main/java/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java diff --git a/server/src/org/mozilla/javascript/xmlimpl/XmlNode.java b/server/src/main/java/org/mozilla/javascript/xmlimpl/XmlNode.java similarity index 100% rename from server/src/org/mozilla/javascript/xmlimpl/XmlNode.java rename to server/src/main/java/org/mozilla/javascript/xmlimpl/XmlNode.java diff --git a/server/src/org/mozilla/javascript/xmlimpl/XmlProcessor.java b/server/src/main/java/org/mozilla/javascript/xmlimpl/XmlProcessor.java similarity index 100% rename from server/src/org/mozilla/javascript/xmlimpl/XmlProcessor.java rename to server/src/main/java/org/mozilla/javascript/xmlimpl/XmlProcessor.java diff --git a/server/Mirth Connect Server.launch b/server/src/main/resources/Mirth Connect Server.launch similarity index 100% rename from server/Mirth Connect Server.launch rename to server/src/main/resources/Mirth Connect Server.launch diff --git a/server/basedir-includes/engine.vmoptions b/server/src/main/resources/basedir-includes/engine.vmoptions similarity index 100% rename from server/basedir-includes/engine.vmoptions rename to server/src/main/resources/basedir-includes/engine.vmoptions diff --git a/server/conf/base_includes.vmoptions b/server/src/main/resources/conf/base_includes.vmoptions similarity index 100% rename from server/conf/base_includes.vmoptions rename to server/src/main/resources/conf/base_includes.vmoptions diff --git a/server/conf/custom.vmoptions b/server/src/main/resources/conf/custom.vmoptions similarity index 100% rename from server/conf/custom.vmoptions rename to server/src/main/resources/conf/custom.vmoptions diff --git a/server/conf/dbdrivers.xml b/server/src/main/resources/conf/dbdrivers.xml similarity index 100% rename from server/conf/dbdrivers.xml rename to server/src/main/resources/conf/dbdrivers.xml diff --git a/server/conf/default_modules.vmoptions b/server/src/main/resources/conf/default_modules.vmoptions similarity index 100% rename from server/conf/default_modules.vmoptions rename to server/src/main/resources/conf/default_modules.vmoptions diff --git a/server/conf/log4j2.properties b/server/src/main/resources/conf/log4j2.properties similarity index 100% rename from server/conf/log4j2.properties rename to server/src/main/resources/conf/log4j2.properties diff --git a/server/conf/mirth.properties b/server/src/main/resources/conf/mirth.properties similarity index 100% rename from server/conf/mirth.properties rename to server/src/main/resources/conf/mirth.properties diff --git a/server/custom_manifest.mf b/server/src/main/resources/custom_manifest.mf similarity index 100% rename from server/custom_manifest.mf rename to server/src/main/resources/custom_manifest.mf diff --git a/server/dbconf/SqlMapConfig.xml b/server/src/main/resources/dbconf/SqlMapConfig.xml similarity index 100% rename from server/dbconf/SqlMapConfig.xml rename to server/src/main/resources/dbconf/SqlMapConfig.xml diff --git a/server/dbconf/deltas/derby-0-1.sql b/server/src/main/resources/dbconf/deltas/derby-0-1.sql similarity index 100% rename from server/dbconf/deltas/derby-0-1.sql rename to server/src/main/resources/dbconf/deltas/derby-0-1.sql diff --git a/server/dbconf/deltas/derby-1-2.sql b/server/src/main/resources/dbconf/deltas/derby-1-2.sql similarity index 100% rename from server/dbconf/deltas/derby-1-2.sql rename to server/src/main/resources/dbconf/deltas/derby-1-2.sql diff --git a/server/dbconf/deltas/derby-2-3.sql b/server/src/main/resources/dbconf/deltas/derby-2-3.sql similarity index 100% rename from server/dbconf/deltas/derby-2-3.sql rename to server/src/main/resources/dbconf/deltas/derby-2-3.sql diff --git a/server/dbconf/deltas/derby-3-4.sql b/server/src/main/resources/dbconf/deltas/derby-3-4.sql similarity index 100% rename from server/dbconf/deltas/derby-3-4.sql rename to server/src/main/resources/dbconf/deltas/derby-3-4.sql diff --git a/server/dbconf/deltas/derby-3.0.3-3.1.0-create-msg-seq.sql b/server/src/main/resources/dbconf/deltas/derby-3.0.3-3.1.0-create-msg-seq.sql similarity index 100% rename from server/dbconf/deltas/derby-3.0.3-3.1.0-create-msg-seq.sql rename to server/src/main/resources/dbconf/deltas/derby-3.0.3-3.1.0-create-msg-seq.sql diff --git a/server/dbconf/deltas/derby-3.0.3-3.1.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.0.3-3.1.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.0.3-3.1.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.0.3-3.1.0.sql diff --git a/server/dbconf/deltas/derby-3.1.1-3.2.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.1.1-3.2.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.1.1-3.2.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.1.1-3.2.0.sql diff --git a/server/dbconf/deltas/derby-3.2.2-3.3.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.2.2-3.3.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.2.2-3.3.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.2.2-3.3.0.sql diff --git a/server/dbconf/deltas/derby-3.3.2-3.4.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.3.2-3.4.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.3.2-3.4.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.3.2-3.4.0.sql diff --git a/server/dbconf/deltas/derby-3.4.2-3.5.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.4.2-3.5.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.4.2-3.5.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.4.2-3.5.0.sql diff --git a/server/dbconf/deltas/derby-3.6.1-3.7.0.sql b/server/src/main/resources/dbconf/deltas/derby-3.6.1-3.7.0.sql similarity index 100% rename from server/dbconf/deltas/derby-3.6.1-3.7.0.sql rename to server/src/main/resources/dbconf/deltas/derby-3.6.1-3.7.0.sql diff --git a/server/dbconf/deltas/derby-4-5.sql b/server/src/main/resources/dbconf/deltas/derby-4-5.sql similarity index 100% rename from server/dbconf/deltas/derby-4-5.sql rename to server/src/main/resources/dbconf/deltas/derby-4-5.sql diff --git a/server/dbconf/deltas/derby-4.2.0-4.3.0-attachment-table.sql b/server/src/main/resources/dbconf/deltas/derby-4.2.0-4.3.0-attachment-table.sql similarity index 100% rename from server/dbconf/deltas/derby-4.2.0-4.3.0-attachment-table.sql rename to server/src/main/resources/dbconf/deltas/derby-4.2.0-4.3.0-attachment-table.sql diff --git a/server/dbconf/deltas/derby-5-6.sql b/server/src/main/resources/dbconf/deltas/derby-5-6.sql similarity index 100% rename from server/dbconf/deltas/derby-5-6.sql rename to server/src/main/resources/dbconf/deltas/derby-5-6.sql diff --git a/server/dbconf/deltas/derby-6-7.sql b/server/src/main/resources/dbconf/deltas/derby-6-7.sql similarity index 100% rename from server/dbconf/deltas/derby-6-7.sql rename to server/src/main/resources/dbconf/deltas/derby-6-7.sql diff --git a/server/dbconf/deltas/derby-7-8.sql b/server/src/main/resources/dbconf/deltas/derby-7-8.sql similarity index 100% rename from server/dbconf/deltas/derby-7-8.sql rename to server/src/main/resources/dbconf/deltas/derby-7-8.sql diff --git a/server/dbconf/deltas/derby-8-9.sql b/server/src/main/resources/dbconf/deltas/derby-8-9.sql similarity index 100% rename from server/dbconf/deltas/derby-8-9.sql rename to server/src/main/resources/dbconf/deltas/derby-8-9.sql diff --git a/server/dbconf/deltas/derby-9-3.0.0-1.sql b/server/src/main/resources/dbconf/deltas/derby-9-3.0.0-1.sql similarity index 100% rename from server/dbconf/deltas/derby-9-3.0.0-1.sql rename to server/src/main/resources/dbconf/deltas/derby-9-3.0.0-1.sql diff --git a/server/dbconf/deltas/derby-9-3.0.0-2.sql b/server/src/main/resources/dbconf/deltas/derby-9-3.0.0-2.sql similarity index 100% rename from server/dbconf/deltas/derby-9-3.0.0-2.sql rename to server/src/main/resources/dbconf/deltas/derby-9-3.0.0-2.sql diff --git a/server/dbconf/deltas/derby-9-4.1.0.sql b/server/src/main/resources/dbconf/deltas/derby-9-4.1.0.sql similarity index 100% rename from server/dbconf/deltas/derby-9-4.1.0.sql rename to server/src/main/resources/dbconf/deltas/derby-9-4.1.0.sql diff --git a/server/dbconf/deltas/mysql-0-1.sql b/server/src/main/resources/dbconf/deltas/mysql-0-1.sql similarity index 100% rename from server/dbconf/deltas/mysql-0-1.sql rename to server/src/main/resources/dbconf/deltas/mysql-0-1.sql diff --git a/server/dbconf/deltas/mysql-1-2.sql b/server/src/main/resources/dbconf/deltas/mysql-1-2.sql similarity index 100% rename from server/dbconf/deltas/mysql-1-2.sql rename to server/src/main/resources/dbconf/deltas/mysql-1-2.sql diff --git a/server/dbconf/deltas/mysql-2-3.sql b/server/src/main/resources/dbconf/deltas/mysql-2-3.sql similarity index 100% rename from server/dbconf/deltas/mysql-2-3.sql rename to server/src/main/resources/dbconf/deltas/mysql-2-3.sql diff --git a/server/dbconf/deltas/mysql-3-4.sql b/server/src/main/resources/dbconf/deltas/mysql-3-4.sql similarity index 100% rename from server/dbconf/deltas/mysql-3-4.sql rename to server/src/main/resources/dbconf/deltas/mysql-3-4.sql diff --git a/server/dbconf/deltas/mysql-3.0.3-3.1.0-create-msg-seq.sql b/server/src/main/resources/dbconf/deltas/mysql-3.0.3-3.1.0-create-msg-seq.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.0.3-3.1.0-create-msg-seq.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.0.3-3.1.0-create-msg-seq.sql diff --git a/server/dbconf/deltas/mysql-3.0.3-3.1.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.0.3-3.1.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.0.3-3.1.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.0.3-3.1.0.sql diff --git a/server/dbconf/deltas/mysql-3.1.1-3.2.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.1.1-3.2.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.1.1-3.2.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.1.1-3.2.0.sql diff --git a/server/dbconf/deltas/mysql-3.2.2-3.3.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.2.2-3.3.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.2.2-3.3.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.2.2-3.3.0.sql diff --git a/server/dbconf/deltas/mysql-3.3.2-3.4.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.3.2-3.4.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.3.2-3.4.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.3.2-3.4.0.sql diff --git a/server/dbconf/deltas/mysql-3.4.2-3.5.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.4.2-3.5.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.4.2-3.5.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.4.2-3.5.0.sql diff --git a/server/dbconf/deltas/mysql-3.6.1-3.7.0.sql b/server/src/main/resources/dbconf/deltas/mysql-3.6.1-3.7.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-3.6.1-3.7.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-3.6.1-3.7.0.sql diff --git a/server/dbconf/deltas/mysql-4-5.sql b/server/src/main/resources/dbconf/deltas/mysql-4-5.sql similarity index 100% rename from server/dbconf/deltas/mysql-4-5.sql rename to server/src/main/resources/dbconf/deltas/mysql-4-5.sql diff --git a/server/dbconf/deltas/mysql-4.2.0-4.3.0-attachment-table.sql b/server/src/main/resources/dbconf/deltas/mysql-4.2.0-4.3.0-attachment-table.sql similarity index 100% rename from server/dbconf/deltas/mysql-4.2.0-4.3.0-attachment-table.sql rename to server/src/main/resources/dbconf/deltas/mysql-4.2.0-4.3.0-attachment-table.sql diff --git a/server/dbconf/deltas/mysql-5-6.sql b/server/src/main/resources/dbconf/deltas/mysql-5-6.sql similarity index 100% rename from server/dbconf/deltas/mysql-5-6.sql rename to server/src/main/resources/dbconf/deltas/mysql-5-6.sql diff --git a/server/dbconf/deltas/mysql-6-7.sql b/server/src/main/resources/dbconf/deltas/mysql-6-7.sql similarity index 100% rename from server/dbconf/deltas/mysql-6-7.sql rename to server/src/main/resources/dbconf/deltas/mysql-6-7.sql diff --git a/server/dbconf/deltas/mysql-7-8.sql b/server/src/main/resources/dbconf/deltas/mysql-7-8.sql similarity index 100% rename from server/dbconf/deltas/mysql-7-8.sql rename to server/src/main/resources/dbconf/deltas/mysql-7-8.sql diff --git a/server/dbconf/deltas/mysql-8-9.sql b/server/src/main/resources/dbconf/deltas/mysql-8-9.sql similarity index 100% rename from server/dbconf/deltas/mysql-8-9.sql rename to server/src/main/resources/dbconf/deltas/mysql-8-9.sql diff --git a/server/dbconf/deltas/mysql-9-3.0.0-1.sql b/server/src/main/resources/dbconf/deltas/mysql-9-3.0.0-1.sql similarity index 100% rename from server/dbconf/deltas/mysql-9-3.0.0-1.sql rename to server/src/main/resources/dbconf/deltas/mysql-9-3.0.0-1.sql diff --git a/server/dbconf/deltas/mysql-9-3.0.0-2.sql b/server/src/main/resources/dbconf/deltas/mysql-9-3.0.0-2.sql similarity index 100% rename from server/dbconf/deltas/mysql-9-3.0.0-2.sql rename to server/src/main/resources/dbconf/deltas/mysql-9-3.0.0-2.sql diff --git a/server/dbconf/deltas/mysql-9-4.1.0.sql b/server/src/main/resources/dbconf/deltas/mysql-9-4.1.0.sql similarity index 100% rename from server/dbconf/deltas/mysql-9-4.1.0.sql rename to server/src/main/resources/dbconf/deltas/mysql-9-4.1.0.sql diff --git a/server/dbconf/deltas/oracle-0-1.sql b/server/src/main/resources/dbconf/deltas/oracle-0-1.sql similarity index 100% rename from server/dbconf/deltas/oracle-0-1.sql rename to server/src/main/resources/dbconf/deltas/oracle-0-1.sql diff --git a/server/dbconf/deltas/oracle-1-2.sql b/server/src/main/resources/dbconf/deltas/oracle-1-2.sql similarity index 100% rename from server/dbconf/deltas/oracle-1-2.sql rename to server/src/main/resources/dbconf/deltas/oracle-1-2.sql diff --git a/server/dbconf/deltas/oracle-2-3.sql b/server/src/main/resources/dbconf/deltas/oracle-2-3.sql similarity index 100% rename from server/dbconf/deltas/oracle-2-3.sql rename to server/src/main/resources/dbconf/deltas/oracle-2-3.sql diff --git a/server/dbconf/deltas/oracle-3-4.sql b/server/src/main/resources/dbconf/deltas/oracle-3-4.sql similarity index 100% rename from server/dbconf/deltas/oracle-3-4.sql rename to server/src/main/resources/dbconf/deltas/oracle-3-4.sql diff --git a/server/dbconf/deltas/oracle-3.0.3-3.1.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.0.3-3.1.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.0.3-3.1.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.0.3-3.1.0.sql diff --git a/server/dbconf/deltas/oracle-3.1.1-3.2.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.1.1-3.2.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.1.1-3.2.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.1.1-3.2.0.sql diff --git a/server/dbconf/deltas/oracle-3.2.2-3.3.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.2.2-3.3.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.2.2-3.3.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.2.2-3.3.0.sql diff --git a/server/dbconf/deltas/oracle-3.3.2-3.4.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.3.2-3.4.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.3.2-3.4.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.3.2-3.4.0.sql diff --git a/server/dbconf/deltas/oracle-3.4.2-3.5.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.4.2-3.5.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.4.2-3.5.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.4.2-3.5.0.sql diff --git a/server/dbconf/deltas/oracle-3.6.1-3.7.0.sql b/server/src/main/resources/dbconf/deltas/oracle-3.6.1-3.7.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-3.6.1-3.7.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-3.6.1-3.7.0.sql diff --git a/server/dbconf/deltas/oracle-4-5.sql b/server/src/main/resources/dbconf/deltas/oracle-4-5.sql similarity index 100% rename from server/dbconf/deltas/oracle-4-5.sql rename to server/src/main/resources/dbconf/deltas/oracle-4-5.sql diff --git a/server/dbconf/deltas/oracle-4.2.0-4.3.0-attachment-table.sql b/server/src/main/resources/dbconf/deltas/oracle-4.2.0-4.3.0-attachment-table.sql similarity index 100% rename from server/dbconf/deltas/oracle-4.2.0-4.3.0-attachment-table.sql rename to server/src/main/resources/dbconf/deltas/oracle-4.2.0-4.3.0-attachment-table.sql diff --git a/server/dbconf/deltas/oracle-5-6.sql b/server/src/main/resources/dbconf/deltas/oracle-5-6.sql similarity index 100% rename from server/dbconf/deltas/oracle-5-6.sql rename to server/src/main/resources/dbconf/deltas/oracle-5-6.sql diff --git a/server/dbconf/deltas/oracle-6-7.sql b/server/src/main/resources/dbconf/deltas/oracle-6-7.sql similarity index 100% rename from server/dbconf/deltas/oracle-6-7.sql rename to server/src/main/resources/dbconf/deltas/oracle-6-7.sql diff --git a/server/dbconf/deltas/oracle-7-8.sql b/server/src/main/resources/dbconf/deltas/oracle-7-8.sql similarity index 100% rename from server/dbconf/deltas/oracle-7-8.sql rename to server/src/main/resources/dbconf/deltas/oracle-7-8.sql diff --git a/server/dbconf/deltas/oracle-8-9.sql b/server/src/main/resources/dbconf/deltas/oracle-8-9.sql similarity index 100% rename from server/dbconf/deltas/oracle-8-9.sql rename to server/src/main/resources/dbconf/deltas/oracle-8-9.sql diff --git a/server/dbconf/deltas/oracle-9-3.0.0-1.sql b/server/src/main/resources/dbconf/deltas/oracle-9-3.0.0-1.sql similarity index 100% rename from server/dbconf/deltas/oracle-9-3.0.0-1.sql rename to server/src/main/resources/dbconf/deltas/oracle-9-3.0.0-1.sql diff --git a/server/dbconf/deltas/oracle-9-3.0.0-2.sql b/server/src/main/resources/dbconf/deltas/oracle-9-3.0.0-2.sql similarity index 100% rename from server/dbconf/deltas/oracle-9-3.0.0-2.sql rename to server/src/main/resources/dbconf/deltas/oracle-9-3.0.0-2.sql diff --git a/server/dbconf/deltas/oracle-9-4.1.0.sql b/server/src/main/resources/dbconf/deltas/oracle-9-4.1.0.sql similarity index 100% rename from server/dbconf/deltas/oracle-9-4.1.0.sql rename to server/src/main/resources/dbconf/deltas/oracle-9-4.1.0.sql diff --git a/server/dbconf/deltas/postgres-0-1.sql b/server/src/main/resources/dbconf/deltas/postgres-0-1.sql similarity index 100% rename from server/dbconf/deltas/postgres-0-1.sql rename to server/src/main/resources/dbconf/deltas/postgres-0-1.sql diff --git a/server/dbconf/deltas/postgres-1-2.sql b/server/src/main/resources/dbconf/deltas/postgres-1-2.sql similarity index 100% rename from server/dbconf/deltas/postgres-1-2.sql rename to server/src/main/resources/dbconf/deltas/postgres-1-2.sql diff --git a/server/dbconf/deltas/postgres-2-3.sql b/server/src/main/resources/dbconf/deltas/postgres-2-3.sql similarity index 100% rename from server/dbconf/deltas/postgres-2-3.sql rename to server/src/main/resources/dbconf/deltas/postgres-2-3.sql diff --git a/server/dbconf/deltas/postgres-3-4.sql b/server/src/main/resources/dbconf/deltas/postgres-3-4.sql similarity index 100% rename from server/dbconf/deltas/postgres-3-4.sql rename to server/src/main/resources/dbconf/deltas/postgres-3-4.sql diff --git a/server/dbconf/deltas/postgres-3.0.3-3.1.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.0.3-3.1.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.0.3-3.1.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.0.3-3.1.0.sql diff --git a/server/dbconf/deltas/postgres-3.1.1-3.2.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.1.1-3.2.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.1.1-3.2.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.1.1-3.2.0.sql diff --git a/server/dbconf/deltas/postgres-3.2.2-3.3.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.2.2-3.3.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.2.2-3.3.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.2.2-3.3.0.sql diff --git a/server/dbconf/deltas/postgres-3.3.2-3.4.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.3.2-3.4.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.3.2-3.4.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.3.2-3.4.0.sql diff --git a/server/dbconf/deltas/postgres-3.4.2-3.5.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.4.2-3.5.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.4.2-3.5.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.4.2-3.5.0.sql diff --git a/server/dbconf/deltas/postgres-3.6.1-3.7.0.sql b/server/src/main/resources/dbconf/deltas/postgres-3.6.1-3.7.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-3.6.1-3.7.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-3.6.1-3.7.0.sql diff --git a/server/dbconf/deltas/postgres-4-5.sql b/server/src/main/resources/dbconf/deltas/postgres-4-5.sql similarity index 100% rename from server/dbconf/deltas/postgres-4-5.sql rename to server/src/main/resources/dbconf/deltas/postgres-4-5.sql diff --git a/server/dbconf/deltas/postgres-4.2.0-4.3.0-attachment-table.sql b/server/src/main/resources/dbconf/deltas/postgres-4.2.0-4.3.0-attachment-table.sql similarity index 100% rename from server/dbconf/deltas/postgres-4.2.0-4.3.0-attachment-table.sql rename to server/src/main/resources/dbconf/deltas/postgres-4.2.0-4.3.0-attachment-table.sql diff --git a/server/dbconf/deltas/postgres-5-6.sql b/server/src/main/resources/dbconf/deltas/postgres-5-6.sql similarity index 100% rename from server/dbconf/deltas/postgres-5-6.sql rename to server/src/main/resources/dbconf/deltas/postgres-5-6.sql diff --git a/server/dbconf/deltas/postgres-6-7.sql b/server/src/main/resources/dbconf/deltas/postgres-6-7.sql similarity index 100% rename from server/dbconf/deltas/postgres-6-7.sql rename to server/src/main/resources/dbconf/deltas/postgres-6-7.sql diff --git a/server/dbconf/deltas/postgres-7-8.sql b/server/src/main/resources/dbconf/deltas/postgres-7-8.sql similarity index 100% rename from server/dbconf/deltas/postgres-7-8.sql rename to server/src/main/resources/dbconf/deltas/postgres-7-8.sql diff --git a/server/dbconf/deltas/postgres-8-9.sql b/server/src/main/resources/dbconf/deltas/postgres-8-9.sql similarity index 100% rename from server/dbconf/deltas/postgres-8-9.sql rename to server/src/main/resources/dbconf/deltas/postgres-8-9.sql diff --git a/server/dbconf/deltas/postgres-9-3.0.0-1.sql b/server/src/main/resources/dbconf/deltas/postgres-9-3.0.0-1.sql similarity index 100% rename from server/dbconf/deltas/postgres-9-3.0.0-1.sql rename to server/src/main/resources/dbconf/deltas/postgres-9-3.0.0-1.sql diff --git a/server/dbconf/deltas/postgres-9-3.0.0-2.sql b/server/src/main/resources/dbconf/deltas/postgres-9-3.0.0-2.sql similarity index 100% rename from server/dbconf/deltas/postgres-9-3.0.0-2.sql rename to server/src/main/resources/dbconf/deltas/postgres-9-3.0.0-2.sql diff --git a/server/dbconf/deltas/postgres-9-4.1.0.sql b/server/src/main/resources/dbconf/deltas/postgres-9-4.1.0.sql similarity index 100% rename from server/dbconf/deltas/postgres-9-4.1.0.sql rename to server/src/main/resources/dbconf/deltas/postgres-9-4.1.0.sql diff --git a/server/dbconf/deltas/sqlserver-0-1.sql b/server/src/main/resources/dbconf/deltas/sqlserver-0-1.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-0-1.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-0-1.sql diff --git a/server/dbconf/deltas/sqlserver-1-2.sql b/server/src/main/resources/dbconf/deltas/sqlserver-1-2.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-1-2.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-1-2.sql diff --git a/server/dbconf/deltas/sqlserver-2-3.sql b/server/src/main/resources/dbconf/deltas/sqlserver-2-3.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-2-3.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-2-3.sql diff --git a/server/dbconf/deltas/sqlserver-3-4.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3-4.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3-4.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3-4.sql diff --git a/server/dbconf/deltas/sqlserver-3.0.3-3.1.0-create-msg-seq.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.0.3-3.1.0-create-msg-seq.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.0.3-3.1.0-create-msg-seq.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.0.3-3.1.0-create-msg-seq.sql diff --git a/server/dbconf/deltas/sqlserver-3.0.3-3.1.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.0.3-3.1.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.0.3-3.1.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.0.3-3.1.0.sql diff --git a/server/dbconf/deltas/sqlserver-3.1.1-3.2.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.1.1-3.2.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.1.1-3.2.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.1.1-3.2.0.sql diff --git a/server/dbconf/deltas/sqlserver-3.2.2-3.3.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.2.2-3.3.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.2.2-3.3.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.2.2-3.3.0.sql diff --git a/server/dbconf/deltas/sqlserver-3.3.2-3.4.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.3.2-3.4.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.3.2-3.4.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.3.2-3.4.0.sql diff --git a/server/dbconf/deltas/sqlserver-3.4.2-3.5.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.4.2-3.5.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.4.2-3.5.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.4.2-3.5.0.sql diff --git a/server/dbconf/deltas/sqlserver-3.6.1-3.7.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-3.6.1-3.7.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-3.6.1-3.7.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-3.6.1-3.7.0.sql diff --git a/server/dbconf/deltas/sqlserver-4-5.sql b/server/src/main/resources/dbconf/deltas/sqlserver-4-5.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-4-5.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-4-5.sql diff --git a/server/dbconf/deltas/sqlserver-4.2.0-4.3.0-attachment-table.sql b/server/src/main/resources/dbconf/deltas/sqlserver-4.2.0-4.3.0-attachment-table.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-4.2.0-4.3.0-attachment-table.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-4.2.0-4.3.0-attachment-table.sql diff --git a/server/dbconf/deltas/sqlserver-5-6.sql b/server/src/main/resources/dbconf/deltas/sqlserver-5-6.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-5-6.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-5-6.sql diff --git a/server/dbconf/deltas/sqlserver-6-7.sql b/server/src/main/resources/dbconf/deltas/sqlserver-6-7.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-6-7.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-6-7.sql diff --git a/server/dbconf/deltas/sqlserver-7-8.sql b/server/src/main/resources/dbconf/deltas/sqlserver-7-8.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-7-8.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-7-8.sql diff --git a/server/dbconf/deltas/sqlserver-8-9.sql b/server/src/main/resources/dbconf/deltas/sqlserver-8-9.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-8-9.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-8-9.sql diff --git a/server/dbconf/deltas/sqlserver-9-3.0.0-1.sql b/server/src/main/resources/dbconf/deltas/sqlserver-9-3.0.0-1.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-9-3.0.0-1.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-9-3.0.0-1.sql diff --git a/server/dbconf/deltas/sqlserver-9-3.0.0-2.sql b/server/src/main/resources/dbconf/deltas/sqlserver-9-3.0.0-2.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-9-3.0.0-2.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-9-3.0.0-2.sql diff --git a/server/dbconf/deltas/sqlserver-9-4.1.0.sql b/server/src/main/resources/dbconf/deltas/sqlserver-9-4.1.0.sql similarity index 100% rename from server/dbconf/deltas/sqlserver-9-4.1.0.sql rename to server/src/main/resources/dbconf/deltas/sqlserver-9-4.1.0.sql diff --git a/server/dbconf/derby/derby-alert.xml b/server/src/main/resources/dbconf/derby/derby-alert.xml similarity index 100% rename from server/dbconf/derby/derby-alert.xml rename to server/src/main/resources/dbconf/derby/derby-alert.xml diff --git a/server/dbconf/derby/derby-channel.xml b/server/src/main/resources/dbconf/derby/derby-channel.xml similarity index 100% rename from server/dbconf/derby/derby-channel.xml rename to server/src/main/resources/dbconf/derby/derby-channel.xml diff --git a/server/dbconf/derby/derby-codeTemplate.xml b/server/src/main/resources/dbconf/derby/derby-codeTemplate.xml similarity index 100% rename from server/dbconf/derby/derby-codeTemplate.xml rename to server/src/main/resources/dbconf/derby/derby-codeTemplate.xml diff --git a/server/dbconf/derby/derby-configuration.xml b/server/src/main/resources/dbconf/derby/derby-configuration.xml similarity index 100% rename from server/dbconf/derby/derby-configuration.xml rename to server/src/main/resources/dbconf/derby/derby-configuration.xml diff --git a/server/dbconf/derby/derby-create-startup-lock-table.sql b/server/src/main/resources/dbconf/derby/derby-create-startup-lock-table.sql similarity index 100% rename from server/dbconf/derby/derby-create-startup-lock-table.sql rename to server/src/main/resources/dbconf/derby/derby-create-startup-lock-table.sql diff --git a/server/dbconf/derby/derby-database.sql b/server/src/main/resources/dbconf/derby/derby-database.sql similarity index 100% rename from server/dbconf/derby/derby-database.sql rename to server/src/main/resources/dbconf/derby/derby-database.sql diff --git a/server/dbconf/derby/derby-debugusage.xml b/server/src/main/resources/dbconf/derby/derby-debugusage.xml similarity index 100% rename from server/dbconf/derby/derby-debugusage.xml rename to server/src/main/resources/dbconf/derby/derby-debugusage.xml diff --git a/server/dbconf/derby/derby-event.xml b/server/src/main/resources/dbconf/derby/derby-event.xml similarity index 100% rename from server/dbconf/derby/derby-event.xml rename to server/src/main/resources/dbconf/derby/derby-event.xml diff --git a/server/dbconf/derby/derby-message.xml b/server/src/main/resources/dbconf/derby/derby-message.xml similarity index 100% rename from server/dbconf/derby/derby-message.xml rename to server/src/main/resources/dbconf/derby/derby-message.xml diff --git a/server/dbconf/derby/derby-script.xml b/server/src/main/resources/dbconf/derby/derby-script.xml similarity index 100% rename from server/dbconf/derby/derby-script.xml rename to server/src/main/resources/dbconf/derby/derby-script.xml diff --git a/server/dbconf/derby/derby-user.xml b/server/src/main/resources/dbconf/derby/derby-user.xml similarity index 100% rename from server/dbconf/derby/derby-user.xml rename to server/src/main/resources/dbconf/derby/derby-user.xml diff --git a/server/dbconf/mysql/mysql-alert.xml b/server/src/main/resources/dbconf/mysql/mysql-alert.xml similarity index 100% rename from server/dbconf/mysql/mysql-alert.xml rename to server/src/main/resources/dbconf/mysql/mysql-alert.xml diff --git a/server/dbconf/mysql/mysql-channel.xml b/server/src/main/resources/dbconf/mysql/mysql-channel.xml similarity index 100% rename from server/dbconf/mysql/mysql-channel.xml rename to server/src/main/resources/dbconf/mysql/mysql-channel.xml diff --git a/server/dbconf/mysql/mysql-codeTemplate.xml b/server/src/main/resources/dbconf/mysql/mysql-codeTemplate.xml similarity index 100% rename from server/dbconf/mysql/mysql-codeTemplate.xml rename to server/src/main/resources/dbconf/mysql/mysql-codeTemplate.xml diff --git a/server/dbconf/mysql/mysql-configuration.xml b/server/src/main/resources/dbconf/mysql/mysql-configuration.xml similarity index 100% rename from server/dbconf/mysql/mysql-configuration.xml rename to server/src/main/resources/dbconf/mysql/mysql-configuration.xml diff --git a/server/dbconf/mysql/mysql-create-startup-lock-table.sql b/server/src/main/resources/dbconf/mysql/mysql-create-startup-lock-table.sql similarity index 100% rename from server/dbconf/mysql/mysql-create-startup-lock-table.sql rename to server/src/main/resources/dbconf/mysql/mysql-create-startup-lock-table.sql diff --git a/server/dbconf/mysql/mysql-database.sql b/server/src/main/resources/dbconf/mysql/mysql-database.sql similarity index 100% rename from server/dbconf/mysql/mysql-database.sql rename to server/src/main/resources/dbconf/mysql/mysql-database.sql diff --git a/server/dbconf/mysql/mysql-debugusage.xml b/server/src/main/resources/dbconf/mysql/mysql-debugusage.xml similarity index 100% rename from server/dbconf/mysql/mysql-debugusage.xml rename to server/src/main/resources/dbconf/mysql/mysql-debugusage.xml diff --git a/server/dbconf/mysql/mysql-event.xml b/server/src/main/resources/dbconf/mysql/mysql-event.xml similarity index 100% rename from server/dbconf/mysql/mysql-event.xml rename to server/src/main/resources/dbconf/mysql/mysql-event.xml diff --git a/server/dbconf/mysql/mysql-message.xml b/server/src/main/resources/dbconf/mysql/mysql-message.xml similarity index 100% rename from server/dbconf/mysql/mysql-message.xml rename to server/src/main/resources/dbconf/mysql/mysql-message.xml diff --git a/server/dbconf/mysql/mysql-script.xml b/server/src/main/resources/dbconf/mysql/mysql-script.xml similarity index 100% rename from server/dbconf/mysql/mysql-script.xml rename to server/src/main/resources/dbconf/mysql/mysql-script.xml diff --git a/server/dbconf/mysql/mysql-user.xml b/server/src/main/resources/dbconf/mysql/mysql-user.xml similarity index 100% rename from server/dbconf/mysql/mysql-user.xml rename to server/src/main/resources/dbconf/mysql/mysql-user.xml diff --git a/server/dbconf/oracle/oracle-alert.xml b/server/src/main/resources/dbconf/oracle/oracle-alert.xml similarity index 100% rename from server/dbconf/oracle/oracle-alert.xml rename to server/src/main/resources/dbconf/oracle/oracle-alert.xml diff --git a/server/dbconf/oracle/oracle-channel.xml b/server/src/main/resources/dbconf/oracle/oracle-channel.xml similarity index 100% rename from server/dbconf/oracle/oracle-channel.xml rename to server/src/main/resources/dbconf/oracle/oracle-channel.xml diff --git a/server/dbconf/oracle/oracle-codeTemplate.xml b/server/src/main/resources/dbconf/oracle/oracle-codeTemplate.xml similarity index 100% rename from server/dbconf/oracle/oracle-codeTemplate.xml rename to server/src/main/resources/dbconf/oracle/oracle-codeTemplate.xml diff --git a/server/dbconf/oracle/oracle-configuration.xml b/server/src/main/resources/dbconf/oracle/oracle-configuration.xml similarity index 100% rename from server/dbconf/oracle/oracle-configuration.xml rename to server/src/main/resources/dbconf/oracle/oracle-configuration.xml diff --git a/server/dbconf/oracle/oracle-create-startup-lock-table.sql b/server/src/main/resources/dbconf/oracle/oracle-create-startup-lock-table.sql similarity index 100% rename from server/dbconf/oracle/oracle-create-startup-lock-table.sql rename to server/src/main/resources/dbconf/oracle/oracle-create-startup-lock-table.sql diff --git a/server/dbconf/oracle/oracle-database.sql b/server/src/main/resources/dbconf/oracle/oracle-database.sql similarity index 100% rename from server/dbconf/oracle/oracle-database.sql rename to server/src/main/resources/dbconf/oracle/oracle-database.sql diff --git a/server/dbconf/oracle/oracle-debugusage.xml b/server/src/main/resources/dbconf/oracle/oracle-debugusage.xml similarity index 100% rename from server/dbconf/oracle/oracle-debugusage.xml rename to server/src/main/resources/dbconf/oracle/oracle-debugusage.xml diff --git a/server/dbconf/oracle/oracle-event.xml b/server/src/main/resources/dbconf/oracle/oracle-event.xml similarity index 100% rename from server/dbconf/oracle/oracle-event.xml rename to server/src/main/resources/dbconf/oracle/oracle-event.xml diff --git a/server/dbconf/oracle/oracle-message.xml b/server/src/main/resources/dbconf/oracle/oracle-message.xml similarity index 100% rename from server/dbconf/oracle/oracle-message.xml rename to server/src/main/resources/dbconf/oracle/oracle-message.xml diff --git a/server/dbconf/oracle/oracle-script.xml b/server/src/main/resources/dbconf/oracle/oracle-script.xml similarity index 100% rename from server/dbconf/oracle/oracle-script.xml rename to server/src/main/resources/dbconf/oracle/oracle-script.xml diff --git a/server/dbconf/oracle/oracle-user.xml b/server/src/main/resources/dbconf/oracle/oracle-user.xml similarity index 100% rename from server/dbconf/oracle/oracle-user.xml rename to server/src/main/resources/dbconf/oracle/oracle-user.xml diff --git a/server/dbconf/postgres/postgres-alert.xml b/server/src/main/resources/dbconf/postgres/postgres-alert.xml similarity index 100% rename from server/dbconf/postgres/postgres-alert.xml rename to server/src/main/resources/dbconf/postgres/postgres-alert.xml diff --git a/server/dbconf/postgres/postgres-channel.xml b/server/src/main/resources/dbconf/postgres/postgres-channel.xml similarity index 100% rename from server/dbconf/postgres/postgres-channel.xml rename to server/src/main/resources/dbconf/postgres/postgres-channel.xml diff --git a/server/dbconf/postgres/postgres-codeTemplate.xml b/server/src/main/resources/dbconf/postgres/postgres-codeTemplate.xml similarity index 100% rename from server/dbconf/postgres/postgres-codeTemplate.xml rename to server/src/main/resources/dbconf/postgres/postgres-codeTemplate.xml diff --git a/server/dbconf/postgres/postgres-configuration.xml b/server/src/main/resources/dbconf/postgres/postgres-configuration.xml similarity index 100% rename from server/dbconf/postgres/postgres-configuration.xml rename to server/src/main/resources/dbconf/postgres/postgres-configuration.xml diff --git a/server/dbconf/postgres/postgres-create-startup-lock-table.sql b/server/src/main/resources/dbconf/postgres/postgres-create-startup-lock-table.sql similarity index 100% rename from server/dbconf/postgres/postgres-create-startup-lock-table.sql rename to server/src/main/resources/dbconf/postgres/postgres-create-startup-lock-table.sql diff --git a/server/dbconf/postgres/postgres-database.sql b/server/src/main/resources/dbconf/postgres/postgres-database.sql similarity index 100% rename from server/dbconf/postgres/postgres-database.sql rename to server/src/main/resources/dbconf/postgres/postgres-database.sql diff --git a/server/dbconf/postgres/postgres-debugusage.xml b/server/src/main/resources/dbconf/postgres/postgres-debugusage.xml similarity index 100% rename from server/dbconf/postgres/postgres-debugusage.xml rename to server/src/main/resources/dbconf/postgres/postgres-debugusage.xml diff --git a/server/dbconf/postgres/postgres-event.xml b/server/src/main/resources/dbconf/postgres/postgres-event.xml similarity index 100% rename from server/dbconf/postgres/postgres-event.xml rename to server/src/main/resources/dbconf/postgres/postgres-event.xml diff --git a/server/dbconf/postgres/postgres-message.xml b/server/src/main/resources/dbconf/postgres/postgres-message.xml similarity index 100% rename from server/dbconf/postgres/postgres-message.xml rename to server/src/main/resources/dbconf/postgres/postgres-message.xml diff --git a/server/dbconf/postgres/postgres-script.xml b/server/src/main/resources/dbconf/postgres/postgres-script.xml similarity index 100% rename from server/dbconf/postgres/postgres-script.xml rename to server/src/main/resources/dbconf/postgres/postgres-script.xml diff --git a/server/dbconf/postgres/postgres-user.xml b/server/src/main/resources/dbconf/postgres/postgres-user.xml similarity index 100% rename from server/dbconf/postgres/postgres-user.xml rename to server/src/main/resources/dbconf/postgres/postgres-user.xml diff --git a/server/dbconf/sqlserver/sqlserver-alert.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-alert.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-alert.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-alert.xml diff --git a/server/dbconf/sqlserver/sqlserver-channel.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-channel.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-channel.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-channel.xml diff --git a/server/dbconf/sqlserver/sqlserver-codeTemplate.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-codeTemplate.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-codeTemplate.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-codeTemplate.xml diff --git a/server/dbconf/sqlserver/sqlserver-configuration.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-configuration.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-configuration.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-configuration.xml diff --git a/server/dbconf/sqlserver/sqlserver-create-startup-lock-table.sql b/server/src/main/resources/dbconf/sqlserver/sqlserver-create-startup-lock-table.sql similarity index 100% rename from server/dbconf/sqlserver/sqlserver-create-startup-lock-table.sql rename to server/src/main/resources/dbconf/sqlserver/sqlserver-create-startup-lock-table.sql diff --git a/server/dbconf/sqlserver/sqlserver-database.sql b/server/src/main/resources/dbconf/sqlserver/sqlserver-database.sql similarity index 100% rename from server/dbconf/sqlserver/sqlserver-database.sql rename to server/src/main/resources/dbconf/sqlserver/sqlserver-database.sql diff --git a/server/dbconf/sqlserver/sqlserver-debugusage.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-debugusage.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-debugusage.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-debugusage.xml diff --git a/server/dbconf/sqlserver/sqlserver-event.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-event.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-event.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-event.xml diff --git a/server/dbconf/sqlserver/sqlserver-message.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-message.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-message.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-message.xml diff --git a/server/dbconf/sqlserver/sqlserver-script.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-script.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-script.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-script.xml diff --git a/server/dbconf/sqlserver/sqlserver-user.xml b/server/src/main/resources/dbconf/sqlserver/sqlserver-user.xml similarity index 100% rename from server/dbconf/sqlserver/sqlserver-user.xml rename to server/src/main/resources/dbconf/sqlserver/sqlserver-user.xml diff --git a/server/derby.properties b/server/src/main/resources/derby.properties similarity index 100% rename from server/derby.properties rename to server/src/main/resources/derby.properties diff --git a/server/docs/LICENSE.txt b/server/src/main/resources/docs/LICENSE.txt similarity index 100% rename from server/docs/LICENSE.txt rename to server/src/main/resources/docs/LICENSE.txt diff --git a/server/docs/README.txt b/server/src/main/resources/docs/README.txt similarity index 100% rename from server/docs/README.txt rename to server/src/main/resources/docs/README.txt diff --git a/server/src/main/resources/docs/javadocs/user-api/allclasses-frame.html b/server/src/main/resources/docs/javadocs/user-api/allclasses-frame.html new file mode 100644 index 0000000000..d9b34a0556 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/allclasses-frame.html @@ -0,0 +1,67 @@ + + + + + +All Classes + + + + + +

All Classes

+
+ +
+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/allclasses-noframe.html b/server/src/main/resources/docs/javadocs/user-api/allclasses-noframe.html new file mode 100644 index 0000000000..1c857d84a9 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/allclasses-noframe.html @@ -0,0 +1,67 @@ + + + + + +All Classes + + + + + +

All Classes

+
+ +
+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.html new file mode 100644 index 0000000000..157a63a757 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthStatus.html @@ -0,0 +1,363 @@ + + + + + +AuthStatus + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.plugins.httpauth.userutil
+

Enum AuthStatus

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Serializable, Comparable<AuthStatus>
    +
    +
    +
    +
    public enum AuthStatus
    +extends Enum<AuthStatus>
    +
    Denotes the result of an HTTP authentication attempt. Available statuses: + + CHALLENGED, SUCCESS, FAILURE
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Enum Constant Detail

      + + + +
        +
      • +

        CHALLENGED

        +
        public static final AuthStatus CHALLENGED
        +
        Indicates that the request should be rejected and an authentication challenge has been sent.
        +
      • +
      + + + +
        +
      • +

        SUCCESS

        +
        public static final AuthStatus SUCCESS
        +
        Indicates that the request should be accepted.
        +
      • +
      + + + +
        +
      • +

        FAILURE

        +
        public static final AuthStatus FAILURE
        +
        Indicates that the request should be rejected without an authentication challenge.
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        values

        +
        public static AuthStatus[] values()
        +
        Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
        +for (AuthStatus c : AuthStatus.values())
        +    System.out.println(c);
        +
        +
        +
        Returns:
        +
        an array containing the constants of this enum type, in the order they are declared
        +
        +
      • +
      + + + +
        +
      • +

        valueOf

        +
        public static AuthStatus valueOf(String name)
        +
        Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
        +
        +
        Parameters:
        +
        name - the name of the enum constant to be returned.
        +
        Returns:
        +
        the enum constant with the specified name
        +
        Throws:
        +
        IllegalArgumentException - if this enum type has no constant with the specified name
        +
        NullPointerException - if the argument is null
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.html new file mode 100644 index 0000000000..22ac640587 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/AuthenticationResult.html @@ -0,0 +1,535 @@ + + + + + +AuthenticationResult + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.plugins.httpauth.userutil
+

Class AuthenticationResult

+
+
+ +
+
    +
  • +
    +
    +
    public class AuthenticationResult
    +extends Object
    +
    This class represents the result of an HTTP authentication attempt, used to accept or reject + requests coming into HTTP-based source connectors.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        AuthenticationResult

        +
        public AuthenticationResult(AuthStatus status)
        +
        Instantiates a new AuthenticationResult object.
        +
        +
        Parameters:
        +
        status - The accept/reject status to use.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getStatus

        +
        public AuthStatus getStatus()
        +
        Returns the accept/reject status of the authentication attempt.
        +
        +
        Returns:
        +
        The accept/reject status of the authentication attempt.
        +
        +
      • +
      + + + +
        +
      • +

        setStatus

        +
        public void setStatus(AuthStatus status)
        +
        Sets the accept/reject status of the authentication attempt.
        +
        +
        Parameters:
        +
        status - The accept/reject status to use.
        +
        +
      • +
      + + + +
        +
      • +

        getUsername

        +
        public String getUsername()
        +
        Returns the username that the request has been authenticated with.
        +
        +
        Returns:
        +
        The username that the request has been authenticated with.
        +
        +
      • +
      + + + +
        +
      • +

        setUsername

        +
        public void setUsername(String username)
        +
        Sets the username that the request has been authenticated with.
        +
        +
        Parameters:
        +
        username - The username that the request has been authenticated with.
        +
        +
      • +
      + + + +
        +
      • +

        getRealm

        +
        public String getRealm()
        +
        Returns the realm that the request has been authenticated with.
        +
        +
        Returns:
        +
        The realm that the request has been authenticated with.
        +
        +
      • +
      + + + +
        +
      • +

        setRealm

        +
        public void setRealm(String realm)
        +
        Sets the realm that the request has been authenticated with.
        +
        +
        Parameters:
        +
        realm - The realm that the request has been authenticated with.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseHeaders

        +
        public Map<String,List<String>> getResponseHeaders()
        +
        Returns the map of HTTP headers to be sent along with the authentication response.
        +
        +
        Returns:
        +
        The map of HTTP headers to be sent along with the authentication response.
        +
        +
      • +
      + + + +
        +
      • +

        setResponseHeaders

        +
        public void setResponseHeaders(Map<String,List<String>> responseHeaders)
        +
        Sets the map of HTTP headers to be sent along with the authentication response.
        +
        +
        Parameters:
        +
        responseHeaders - The map of HTTP headers to be sent along with the authentication response.
        +
        +
      • +
      + + + +
        +
      • +

        addResponseHeader

        +
        public void addResponseHeader(String key,
        +                              String value)
        +
        Adds a new response header to be sent along with the authentication response.
        +
        +
        Parameters:
        +
        key - The name of the header.
        +
        value - The value of the header.
        +
        +
      • +
      + + + +
        +
      • +

        Challenged

        +
        public static AuthenticationResult Challenged(String authenticateHeader)
        +
        Convenience method to create a new AuthenticationResult with the CHALLENGED status.
        +
        +
        Parameters:
        +
        authenticateHeader - The value to include in the WWW-Authenticate response header.
        +
        Returns:
        +
        The created AuthenticationResult object.
        +
        +
      • +
      + + + +
        +
      • +

        Success

        +
        public static AuthenticationResult Success()
        +
        Convenience method to create a new AuthenticationResult with the SUCCESS status.
        +
        +
        Returns:
        +
        The created AuthenticationResult object.
        +
        +
      • +
      + + + +
        +
      • +

        Success

        +
        public static AuthenticationResult Success(String username,
        +                                           String realm)
        +
        Convenience method to create a new AuthenticationResult with the SUCCESS status.
        +
        +
        Parameters:
        +
        username - The username that the request has been authenticated with.
        +
        realm - The realm that the request has been authenticated with.
        +
        Returns:
        +
        The created AuthenticationResult object.
        +
        +
      • +
      + + + +
        +
      • +

        Failure

        +
        public static AuthenticationResult Failure()
        +
        Convenience method to create a new AuthenticationResult with the FAILURE status.
        +
        +
        Returns:
        +
        The created AuthenticationResult object.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-frame.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-frame.html new file mode 100644 index 0000000000..13304b87e9 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-frame.html @@ -0,0 +1,24 @@ + + + + + +com.mirth.connect.plugins.httpauth.userutil + + + + + +

com.mirth.connect.plugins.httpauth.userutil

+
+

Classes

+ +

Enums

+ +
+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-summary.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-summary.html new file mode 100644 index 0000000000..42954fc8c6 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-summary.html @@ -0,0 +1,173 @@ + + + + + +com.mirth.connect.plugins.httpauth.userutil + + + + + + + + +
+ + + + + + + +
+ + +
+

Package com.mirth.connect.plugins.httpauth.userutil

+
+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+

See: Description

+
+
+ + + + +

Package com.mirth.connect.plugins.httpauth.userutil Description

+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-tree.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-tree.html new file mode 100644 index 0000000000..265e5586e1 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/plugins/httpauth/userutil/package-tree.html @@ -0,0 +1,147 @@ + + + + + +com.mirth.connect.plugins.httpauth.userutil Class Hierarchy + + + + + + + + +
+ + + + + + + +
+ + +
+

Hierarchy For Package com.mirth.connect.plugins.httpauth.userutil

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +

Enum Hierarchy

+ +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ACKGenerator.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ACKGenerator.html new file mode 100644 index 0000000000..a76c4dacea --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ACKGenerator.html @@ -0,0 +1,390 @@ + + + + + +ACKGenerator + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ACKGenerator

+
+
+ +
+
    +
  • +
    +
    +
    public class ACKGenerator
    +extends Object
    +
    Allows users to generate HL7 v2.x acknowledgments based on an inbound message, with a specified + ACK code and custom text message. This class will not work as expected if the HL7 v2.x data type + plugin is disabled or uninstalled.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ACKGenerator

        +
        @Deprecated
        +public ACKGenerator()
        +
        Deprecated. 
        +
        Instantiates a new ACKGenerator object.
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        generateAckResponse

        +
        public static String generateAckResponse(String message,
        +                                         String acknowledgementCode,
        +                                         String textMessage)
        +                                  throws Exception
        +
        Generates an HL7 v2.x acknowledgment. Assumes that the inbound message is proper ER7, and + uses the default format "yyyyMMddHHmmss" for the MSH.7 message date/time.
        +
        +
        Parameters:
        +
        message - The inbound HL7 v2.x message to generate the ACK for.
        +
        acknowledgementCode - The MSA.1 ACK code to use (e.g. AA, AR, AE).
        +
        textMessage - The MSA.3 text message to use.
        +
        Returns:
        +
        The generated HL7 v2.x acknowledgment.
        +
        Throws:
        +
        Exception - If the acknowledgement could not be generated.
        +
        +
      • +
      + + + +
        +
      • +

        generateAckResponse

        +
        @Deprecated
        +public static String generateAckResponse(String message,
        +                                                     String dataType,
        +                                                     String acknowledgementCode,
        +                                                     String textMessage,
        +                                                     String dateFormat,
        +                                                     String errorMessage)
        +                                              throws Exception
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + generateAckResponse(message, isXML, acknowledgementCode, textMessage, dateFormat, + errorMessage) instead.
        +
        Generates an HL7 v2.x acknowledgment.
        +
        +
        Parameters:
        +
        message - The inbound HL7 v2.x message to generate the ACK for.
        +
        dataType - If "XML", assumes the inbound message is formatted in XML, and the acknowledgment + returned will also be XML.
        +
        acknowledgementCode - The MSA.1 ACK code to use (e.g. AA, AR, AE).
        +
        textMessage - The MSA.3 text message to use.
        +
        dateFormat - The date/time format used to generate a timestamp for the MSH.7 message date/time + (e.g. "yyyyMMddHHmmss").
        +
        errorMessage - The ERR.1 error message to use. If left blank, an ERR segment will not be + generated.
        +
        Returns:
        +
        The generated HL7 v2.x acknowledgment.
        +
        Throws:
        +
        Exception - If the acknowledgement could not be generated.
        +
        +
      • +
      + + + +
        +
      • +

        generateAckResponse

        +
        public static String generateAckResponse(String message,
        +                                         boolean isXML,
        +                                         String acknowledgementCode,
        +                                         String textMessage,
        +                                         String dateFormat,
        +                                         String errorMessage)
        +                                  throws Exception
        +
        Generates an HL7 v2.x acknowledgment.
        +
        +
        Parameters:
        +
        message - The inbound HL7 v2.x message to generate the ACK for.
        +
        isXML - If true, assumes the inbound message is formatted in XML, and the acknowledgment + returned will also be XML.
        +
        acknowledgementCode - The MSA.1 ACK code to use (e.g. AA, AR, AE).
        +
        textMessage - The MSA.3 text message to use.
        +
        dateFormat - The date/time format used to generate a timestamp for the MSH.7 message date/time + (e.g. "yyyyMMddHHmmss").
        +
        errorMessage - The ERR.1 error message to use. If left blank, an ERR segment will not be + generated.
        +
        Returns:
        +
        The generated HL7 v2.x acknowledgment.
        +
        Throws:
        +
        Exception - If the acknowledgement could not be generated.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AlertSender.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AlertSender.html new file mode 100644 index 0000000000..2ce1111c91 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AlertSender.html @@ -0,0 +1,303 @@ + + + + + +AlertSender + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class AlertSender

+
+
+ +
+
    +
  • +
    +
    +
    public class AlertSender
    +extends Object
    +
    Allows users to dispatch error events which can be alerted on.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        AlertSender

        +
        public AlertSender(String channelId)
        +
        Instantiates a new AlertSender.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel to associate dispatched alert events with.
        +
        +
      • +
      + + + +
        +
      • +

        AlertSender

        +
        public AlertSender(ImmutableConnectorMessage connectorMessage)
        +
        Instantiates a new AlertSender.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to associate dispatched alert events with.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        sendAlert

        +
        public void sendAlert(String errorMessage)
        +
        Dispatches an error event that can be alerted on.
        +
        +
        Parameters:
        +
        errorMessage - A custom error message to include with the error event.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Attachment.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Attachment.html new file mode 100644 index 0000000000..a99521fdd6 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Attachment.html @@ -0,0 +1,584 @@ + + + + + +Attachment + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class Attachment

+
+
+ +
+
    +
  • +
    +
    +
    public class Attachment
    +extends Object
    +
    Used to store and retrieve details about message attachments such as the ID, MIME type, and + content.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Attachment

        +
        public Attachment()
        +
        Instantiates a new Attachment with no ID, content, or MIME type.
        +
      • +
      + + + +
        +
      • +

        Attachment

        +
        public Attachment(String id,
        +                  byte[] content,
        +                  String type)
        +
        Instantiates a new Attachment.
        +
        +
        Parameters:
        +
        id - The unique ID of the attachment.
        +
        content - The content (byte array) to store for the attachment.
        +
        type - The MIME type of the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        Attachment

        +
        public Attachment(String id,
        +                  String content,
        +                  String type)
        +           throws UnsupportedEncodingException
        +
        Instantiates a new Attachment with String data using UTF-8 charset encoding.
        +
        +
        Parameters:
        +
        id - The unique ID of the attachment.
        +
        content - The string representation of the attachment content.
        +
        type - The MIME type of the attachment.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      + + + +
        +
      • +

        Attachment

        +
        public Attachment(String id,
        +                  String content,
        +                  String charset,
        +                  String type)
        +           throws UnsupportedEncodingException
        +
        Instantiates a new Attachment with String data and a given charset encoding.
        +
        +
        Parameters:
        +
        id - The unique ID of the attachment.
        +
        content - The string representation of the attachment content.
        +
        charset - The charset encoding to convert the string to bytes with.
        +
        type - The MIME type of the attachment.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getAttachmentId

        +
        public String getAttachmentId()
        +
        Returns the unique replacement token for the attachment. This token should replace the + attachment content in the message string, and will be used to re-attach the attachment + content in the outbound message before it is sent to a downstream system.
        +
        +
        Returns:
        +
        The unique replacement token for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        getId

        +
        public String getId()
        +
        Returns the unique ID for the attachment.
        +
        +
        Returns:
        +
        The unique ID for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        setId

        +
        public void setId(String id)
        +
        Sets the unique ID for the attachment.
        +
        +
        Parameters:
        +
        id - The unique ID to use for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        getContent

        +
        public byte[] getContent()
        +
        Returns the content of the attachment as a byte array.
        +
        +
        Returns:
        +
        The content of the attachment as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        getContentString

        +
        public String getContentString()
        +                        throws UnsupportedEncodingException
        +
        Returns the content of the attachment as a string, using UTF-8 encoding.
        +
        +
        Returns:
        +
        The content of the attachment as a string, using UTF-8 encoding.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      + + + +
        +
      • +

        getContentString

        +
        public String getContentString(String charset)
        +                        throws UnsupportedEncodingException
        +
        Returns the content of the attachment as a string, using the specified charset encoding.
        +
        +
        Parameters:
        +
        charset - The charset encoding to convert the content bytes to a string with.
        +
        Returns:
        +
        The content of the attachment as a string, using the specified charset encoding.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      + + + +
        +
      • +

        setContent

        +
        public void setContent(byte[] content)
        +
        Sets the content of the attachment.
        +
        +
        Parameters:
        +
        content - The content (byte array) to use for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        setContentString

        +
        public void setContentString(String content)
        +                      throws UnsupportedEncodingException
        +
        Sets the content of the attachment, using UTF-8 encoding.
        +
        +
        Parameters:
        +
        content - The string representation of the attachment content.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      + + + +
        +
      • +

        setContentString

        +
        public void setContentString(String content,
        +                             String charset)
        +                      throws UnsupportedEncodingException
        +
        Sets the content of the attachment, using the specified charset encoding.
        +
        +
        Parameters:
        +
        content - The string representation of the attachment content.
        +
        charset - The charset encoding to convert the string to bytes with.
        +
        Throws:
        +
        UnsupportedEncodingException - If the named charset is not supported.
        +
        +
      • +
      + + + +
        +
      • +

        getType

        +
        public String getType()
        +
        Returns the MIME type of the attachment.
        +
        +
        Returns:
        +
        The MIME type of the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        setType

        +
        public void setType(String type)
        +
        Sets the MIME type for the attachment.
        +
        +
        Parameters:
        +
        type - The MIME type to set for the attachment.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AttachmentUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AttachmentUtil.html new file mode 100644 index 0000000000..20e535102b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/AttachmentUtil.html @@ -0,0 +1,1121 @@ + + + + + +AttachmentUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class AttachmentUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class AttachmentUtil
    +extends Object
    +
    Provides utility methods for creating, retrieving, and re-attaching message attachments.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        reAttachMessage

        +
        public static byte[] reAttachMessage(String raw,
        +                                     ImmutableConnectorMessage connectorMessage,
        +                                     String charsetEncoding,
        +                                     boolean binary)
        +
        Replaces any unique attachment tokens (e.g. "${ATTACH:id}") with the corresponding attachment + content, and returns the full post-replacement message as a byte array.
        +
        +
        Parameters:
        +
        raw - The raw message string to replace tokens from.
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        charsetEncoding - If binary mode is not used, the resulting byte array will be encoded using this + charset.
        +
        binary - If enabled, the raw data is assumed to be Base64 encoded. The resulting byte array + will be the raw Base64 decoded bytes.
        +
        Returns:
        +
        The resulting message as a byte array, with all applicable attachment content + re-inserted.
        +
        +
      • +
      + + + +
        +
      • +

        reAttachMessage

        +
        public static byte[] reAttachMessage(String raw,
        +                                     ImmutableConnectorMessage connectorMessage,
        +                                     String charsetEncoding,
        +                                     boolean binary,
        +                                     boolean reattach,
        +                                     boolean localOnly)
        +
        Replaces any unique attachment tokens (e.g. "${ATTACH:id}") with the corresponding attachment + content, and returns the full post-replacement message as a byte array.
        +
        +
        Parameters:
        +
        raw - The raw message string to replace tokens from.
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        charsetEncoding - If binary mode is not used, the resulting byte array will be encoded using this + charset.
        +
        binary - If enabled, the raw data is assumed to be Base64 encoded. The resulting byte array + will be the raw Base64 decoded bytes.
        +
        reattach - If true, attachment tokens will be replaced with the actual attachment content. + Otherwise, local attachment tokens will be replaced only with the corresponding + expanded tokens.
        +
        localOnly - If true, only local attachment tokens will be replaced, and expanded tokens will + be ignored.
        +
        Returns:
        +
        The resulting message as a byte array, with all applicable attachment content + re-inserted.
        +
        +
      • +
      + + + +
        +
      • +

        reAttachMessage

        +
        public static String reAttachMessage(ImmutableConnectorMessage connectorMessage)
        +
        Replaces any unique attachment tokens (e.g. "${ATTACH:id}") with the corresponding attachment + content, and returns the full post-replacement message.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID. The message string will be either the encoded or raw content.
        +
        Returns:
        +
        The resulting message with all applicable attachment content re-inserted.
        +
        +
      • +
      + + + +
        +
      • +

        reAttachMessage

        +
        public static String reAttachMessage(String raw,
        +                                     ImmutableConnectorMessage connectorMessage)
        +
        Replaces any unique attachment tokens (e.g. "${ATTACH:id}") with the corresponding attachment + content, and returns the full post-replacement message.
        +
        +
        Parameters:
        +
        raw - The raw message string to replace tokens from.
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        Returns:
        +
        The resulting message with all applicable attachment content re-inserted.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachmentIds

        +
        public static List<String> getMessageAttachmentIds(ImmutableConnectorMessage connectorMessage)
        +                                            throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Returns a List of attachment IDs associated with the current channel / message.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        Returns:
        +
        A List of attachment IDs associated with the current channel / message.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment IDs could be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachmentIds

        +
        public static List<String> getMessageAttachmentIds(String channelId,
        +                                                   Long messageId)
        +                                            throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Returns a List of attachment IDs associated with the current channel / message.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel the attachments are associated with.
        +
        messageId - The ID of the message the attachments are associated with.
        +
        Returns:
        +
        A List of attachment IDs associated with the current channel / message.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment IDs could be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachments

        +
        public static List<Attachment> getMessageAttachments(ImmutableConnectorMessage connectorMessage)
        +                                              throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves all attachments associated with a connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        Returns:
        +
        A list of attachments associated with the connector message.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachments

        +
        public static List<Attachment> getMessageAttachments(ImmutableConnectorMessage connectorMessage,
        +                                                     boolean base64Decode)
        +                                              throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves all attachments associated with a connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        base64Decode - If true, the content of each attachment will first be Base64 decoded for + convenient use.
        +
        Returns:
        +
        A list of attachments associated with the connector message.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachments

        +
        public static List<Attachment> getMessageAttachments(String channelId,
        +                                                     Long messageId)
        +                                              throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves all attachments associated with a specific channel/message ID.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel to retrieve the attachments from.
        +
        messageId - The ID of the message to retrieve the attachments from.
        +
        Returns:
        +
        A list of attachments associated with the channel/message ID.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachments

        +
        public static List<Attachment> getMessageAttachments(String channelId,
        +                                                     Long messageId,
        +                                                     boolean base64Decode)
        +                                              throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves all attachments associated with a specific channel/message ID.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel to retrieve the attachments from.
        +
        messageId - The ID of the message to retrieve the attachments from.
        +
        base64Decode - If true, the content of each attachment will first be Base64 decoded for + convenient use.
        +
        Returns:
        +
        A list of attachments associated with the channel/message ID.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachment

        +
        public static Attachment getMessageAttachment(ImmutableConnectorMessage connectorMessage,
        +                                              String attachmentId)
        +                                       throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from the current channel/message ID.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        attachmentId - The ID of the attachment to retrieve.
        +
        Returns:
        +
        The attachment associated with the given IDs, or null if none was found.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachment

        +
        public static Attachment getMessageAttachment(ImmutableConnectorMessage connectorMessage,
        +                                              String attachmentId,
        +                                              boolean base64Decode)
        +                                       throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from the current channel/message ID.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message, used to identify the + channel/message ID.
        +
        attachmentId - The ID of the attachment to retrieve.
        +
        base64Decode - If true, the content of each attachment will first be Base64 decoded for + convenient use.
        +
        Returns:
        +
        The attachment associated with the given IDs, or null if none was found.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachment

        +
        public static Attachment getMessageAttachment(String channelId,
        +                                              Long messageId,
        +                                              String attachmentId)
        +                                       throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from a specific channel/message ID.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel to retrieve the attachment from.
        +
        messageId - The ID of the message to retrieve the attachment from.
        +
        attachmentId - The ID of the attachment to retrieve.
        +
        Returns:
        +
        The attachment associated with the given IDs, or null if none was found.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachment

        +
        public static Attachment getMessageAttachment(String channelId,
        +                                              Long messageId,
        +                                              String attachmentId,
        +                                              boolean base64Decode)
        +                                       throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from a specific channel/message ID.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel to retrieve the attachment from.
        +
        messageId - The ID of the message to retrieve the attachment from.
        +
        attachmentId - The ID of the attachment to retrieve.
        +
        base64Decode - If true, the content of each attachment will first be Base64 decoded for + convenient use.
        +
        Returns:
        +
        The attachment associated with the given IDs, or null if none was found.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachment could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachmentsFromSourceChannel

        +
        public static List<Attachment> getMessageAttachmentsFromSourceChannel(ImmutableConnectorMessage connectorMessage)
        +                                                               throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from an upstream channel that sent a message to the current channel.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message. The channel ID and message ID + will be retrieved from the source map.
        +
        Returns:
        +
        A list of attachments associated with the source channel/message IDs.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageAttachmentsFromSourceChannel

        +
        public static List<Attachment> getMessageAttachmentsFromSourceChannel(ImmutableConnectorMessage connectorMessage,
        +                                                                      boolean base64Decode)
        +                                                               throws com.mirth.connect.donkey.model.message.MessageSerializerException
        +
        Retrieves an attachment from an upstream channel that sent a message to the current channel.
        +
        +
        Parameters:
        +
        connectorMessage - The ConnectorMessage associated with this message. The channel ID and message ID + will be retrieved from the source map.
        +
        base64Decode - If true, the content of each attachment will first be Base64 decoded for + convenient use.
        +
        Returns:
        +
        A list of attachments associated with the source channel/message IDs.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If the attachments could not be retrieved.
        +
        +
      • +
      + + + +
        +
      • +

        addAttachment

        +
        public static Attachment addAttachment(List<Attachment> attachments,
        +                                       Object content,
        +                                       String type)
        +                                throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Creates an Attachment and adds it to the provided list.
        +
        +
        Parameters:
        +
        attachments - The list of attachments to add to.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        Returns:
        +
        The attachment added to the list.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        addAttachment

        +
        public static Attachment addAttachment(List<Attachment> attachments,
        +                                       Object content,
        +                                       String type,
        +                                       boolean base64Encode)
        +                                throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Creates an Attachment and adds it to the provided list.
        +
        +
        Parameters:
        +
        attachments - The list of attachments to add to.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment added to the list.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        createAttachment

        +
        public static Attachment createAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          Object content,
        +                                          String type)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Creates an attachment associated with a given connector message, and inserts it into the + database.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        Returns:
        +
        The attachment that was created and inserted.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        createAttachment

        +
        public static Attachment createAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          Object content,
        +                                          String type,
        +                                          boolean base64Encode)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Creates an attachment associated with a given connector message, and inserts it into the + database.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment that was created and inserted.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          String attachmentId,
        +                                          Object content,
        +                                          String type)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        attachmentId - The unique ID of the attachment to update.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          String attachmentId,
        +                                          Object content,
        +                                          String type,
        +                                          boolean base64Encode)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        attachmentId - The unique ID of the attachment to update.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          Attachment attachment)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        attachment - The Attachment object to update.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(ImmutableConnectorMessage connectorMessage,
        +                                          Attachment attachment,
        +                                          boolean base64Encode)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to be associated with the attachment.
        +
        attachment - The Attachment object to update.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(String channelId,
        +                                          Long messageId,
        +                                          Attachment attachment)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel the attachment is associated with.
        +
        messageId - The ID of the message the attachment is associated with.
        +
        attachment - The Attachment object to update.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(String channelId,
        +                                          Long messageId,
        +                                          Attachment attachment,
        +                                          boolean base64Encode)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel the attachment is associated with.
        +
        messageId - The ID of the message the attachment is associated with.
        +
        attachment - The Attachment object to update.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(String channelId,
        +                                          Long messageId,
        +                                          String attachmentId,
        +                                          Object content,
        +                                          String type)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel the attachment is associated with.
        +
        messageId - The ID of the message the attachment is associated with.
        +
        attachmentId - The unique ID of the attachment to update.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      + + + +
        +
      • +

        updateAttachment

        +
        public static Attachment updateAttachment(String channelId,
        +                                          Long messageId,
        +                                          String attachmentId,
        +                                          Object content,
        +                                          String type,
        +                                          boolean base64Encode)
        +                                   throws com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException
        +
        Updates an attachment associated with a given connector message.
        +
        +
        Parameters:
        +
        channelId - The ID of the channel the attachment is associated with.
        +
        messageId - The ID of the message the attachment is associated with.
        +
        attachmentId - The unique ID of the attachment to update.
        +
        content - The attachment content (must be a string or byte array).
        +
        type - The MIME type of the attachment.
        +
        base64Encode - If true, the content of each attachment will first be Base64 encoded for + convenience.
        +
        Returns:
        +
        The attachment that was updated.
        +
        Throws:
        +
        com.mirth.connect.donkey.server.controllers.UnsupportedDataTypeException - If the attachment content is not a String or byte array.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelMap.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelMap.html new file mode 100644 index 0000000000..e4d45fb47c --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelMap.html @@ -0,0 +1,545 @@ + + + + + +ChannelMap + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ChannelMap

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Map<String,Object>
    +
    +
    +
    +
    public class ChannelMap
    +extends Object
    +implements Map<String,Object>
    +
    A wrapper class for the channel map that checks against the source map in the get(key) method for legacy support.
    +
  • +
+
+
+ +
+
+ +
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelUtil.html new file mode 100644 index 0000000000..054baa1d75 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ChannelUtil.html @@ -0,0 +1,1017 @@ + + + + + +ChannelUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ChannelUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class ChannelUtil
    +extends Object
    +
    This utility class allows the user to query information from channels or to perform actions on + channels.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getChannelNames

        +
        public static List<String> getChannelNames()
        +
        Get all channels names.
        +
        +
        Returns:
        +
        A list of all channel names.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelIds

        +
        public static List<String> getChannelIds()
        +
        Get all channel Ids.
        +
        +
        Returns:
        +
        A list of all channel Ids.
        +
        +
      • +
      + + + +
        +
      • +

        getDeployedChannelNames

        +
        public static List<String> getDeployedChannelNames()
        +
        Get all deployed channels names.
        +
        +
        Returns:
        +
        A list of all deployed channel names.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelName

        +
        public static String getChannelName(String channelId)
        +
        Get the name for a channel.
        +
        +
        Parameters:
        +
        channelId - The channel id of the channel.
        +
        Returns:
        +
        The channel name of the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getDeployedChannelIds

        +
        public static List<String> getDeployedChannelIds()
        +
        Get all deployed channel Ids.
        +
        +
        Returns:
        +
        A list of all deployed channel Ids.
        +
        +
      • +
      + + + +
        +
      • +

        getDeployedChannelName

        +
        public static String getDeployedChannelName(String channelId)
        +
        Get the name for a deployed channel.
        +
        +
        Parameters:
        +
        channelId - The channel id of the deployed channel.
        +
        Returns:
        +
        The channel name of the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getDeployedChannelId

        +
        public static String getDeployedChannelId(String channelName)
        +
        Get the id for a deployed channel.
        +
        +
        Parameters:
        +
        channelName - The channel name of the deployed channel.
        +
        Returns:
        +
        The channel Id of the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        startChannel

        +
        public static Future<Void> startChannel(String channelIdOrName)
        +                                 throws Exception
        +
        Start a deployed channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        stopChannel

        +
        public static Future<Void> stopChannel(String channelIdOrName)
        +                                throws Exception
        +
        Stop a deployed channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        pauseChannel

        +
        public static Future<Void> pauseChannel(String channelIdOrName)
        +                                 throws Exception
        +
        Pause a deployed channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        resumeChannel

        +
        public static Future<Void> resumeChannel(String channelIdOrName)
        +                                  throws Exception
        +
        Resume a deployed channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        haltChannel

        +
        public static Future<Void> haltChannel(String channelIdOrName)
        +                                throws Exception
        +
        Halt a deployed channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelState

        +
        public static DeployedState getChannelState(String channelIdOrName)
        +
        Get the current state of a channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        Returns:
        +
        The current DeployedState.
        +
        +
      • +
      + + + +
        +
      • +

        deployChannel

        +
        public static Future<Void> deployChannel(String channelIdOrName)
        +
        Deploy a channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        +
      • +
      + + + +
        +
      • +

        undeployChannel

        +
        public static Future<Void> undeployChannel(String channelIdOrName)
        +
        Undeploy a channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        +
      • +
      + + + +
        +
      • +

        isChannelDeployed

        +
        public static boolean isChannelDeployed(String channelIdOrName)
        +
        Check if a channel is currently deployed.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        Returns:
        +
        True if the channel is deployed, false if it is not.
        +
        +
      • +
      + + + +
        +
      • +

        startConnector

        +
        public static Future<Void> startConnector(String channelIdOrName,
        +                                          Integer metaDataId)
        +                                   throws Exception
        +
        Start a connector on a given channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        stopConnector

        +
        public static Future<Void> stopConnector(String channelIdOrName,
        +                                         Integer metaDataId)
        +                                  throws Exception
        +
        Stop a connector on a given channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        getConnectorState

        +
        public static DeployedState getConnectorState(String channelIdOrName,
        +                                              Number metaDataId)
        +
        Get the current state of a connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The current connector state returned as the DeployedState enumerator.
        +
        +
      • +
      + + + +
        +
      • +

        getReceivedCount

        +
        public static Long getReceivedCount(String channelIdOrName)
        +
        Get the received count statistic for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        The received count statistic as a Long for the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getReceivedCount

        +
        public static Long getReceivedCount(String channelIdOrName,
        +                                    Number metaDataId)
        +
        Get the received count statistic for a specific connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The received count statistic as a Long for the specified connector.
        +
        +
      • +
      + + + +
        +
      • +

        getFilteredCount

        +
        public static Long getFilteredCount(String channelIdOrName)
        +
        Get the filtered count statistic for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        The filtered count statistic as a Long for the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getFilteredCount

        +
        public static Long getFilteredCount(String channelIdOrName,
        +                                    Number metaDataId)
        +
        Get the filtered count statistic for a specific connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The filtered count statistic as a Long for the specified connector.
        +
        +
      • +
      + + + +
        +
      • +

        getQueuedCount

        +
        public static Long getQueuedCount(String channelIdOrName)
        +
        Get the queued count statistic for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        The queued count statistic as a Long for the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getQueuedCount

        +
        public static Long getQueuedCount(String channelIdOrName,
        +                                  Number metaDataId)
        +
        Get the queued count statistic for a specific connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The queued count statistic as a Long for the specified connector.
        +
        +
      • +
      + + + +
        +
      • +

        getSentCount

        +
        public static Long getSentCount(String channelIdOrName)
        +
        Get the sent count statistic for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        The sent count statistic as a Long for the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getSentCount

        +
        public static Long getSentCount(String channelIdOrName,
        +                                Number metaDataId)
        +
        Get the sent count statistic for a specific connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The sent count statistic as a Long for the specified connector.
        +
        +
      • +
      + + + +
        +
      • +

        getErrorCount

        +
        public static Long getErrorCount(String channelIdOrName)
        +
        Get the error count statistic for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        The error count statistic as a Long for the specified channel.
        +
        +
      • +
      + + + +
        +
      • +

        getErrorCount

        +
        public static Long getErrorCount(String channelIdOrName,
        +                                 Number metaDataId)
        +
        Get the error count statistic for a specific connector.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the connector. Note that the source connector has a metadata id + of 0.
        +
        Returns:
        +
        The error count statistic as a Long for the specified connector.
        +
        +
      • +
      + + + +
        +
      • +

        resetStatistics

        +
        public static Future<Void> resetStatistics(String channelIdOrName)
        +                                    throws Exception
        +
        Reset all statistics for a specific channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        resetStatistics

        +
        public static Future<Void> resetStatistics(String channelIdOrName,
        +                                           Integer metaDataId)
        +                                    throws Exception
        +
        Reset all statistics for the specified connector on the given channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the deployed connector. Note that the source connector has a + metadata id of 0 and the aggregate of null.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      + + + +
        +
      • +

        resetStatistics

        +
        public static Future<Void> resetStatistics(String channelIdOrName,
        +                                           Integer metaDataId,
        +                                           Collection<Status> statuses)
        +                                    throws Exception
        +
        Reset the specified statistics for the specified connector on the given channel.
        +
        +
        Parameters:
        +
        channelIdOrName - The channel id or current name of the deployed channel.
        +
        metaDataId - The metadata id of the deployed connector. Note that the source connector has a + metadata id of 0 and the aggregate of null.
        +
        statuses - A collection of statuses to reset.
        +
        Returns:
        +
        A Future object representing the result of the asynchronous operation. You + can call get() or get(timeoutInMillis) + to wait for the operation to finish.
        +
        Throws:
        +
        Exception - If the task cannot be scheduled for execution.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ContextFactory.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ContextFactory.html new file mode 100644 index 0000000000..d5f2f4c272 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ContextFactory.html @@ -0,0 +1,330 @@ + + + + + +ContextFactory + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ContextFactory

+
+
+ +
+
    +
  • +
    +
    +
    public class ContextFactory
    +extends Object
    +
    Allows the user to retrieve information about the current JavaScript context.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ContextFactory

        +
        public ContextFactory(com.mirth.connect.server.util.javascript.MirthContextFactory delegate)
        +
        Instantiates a new ContextFactory object.
        +
        +
        Parameters:
        +
        delegate - The underlying ContextFactory this class will delegate to.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getResourceIds

        +
        public Set<String> getResourceIds()
        +
        Returns the set of custom resource IDs that the current JavaScript context is using. If no + custom libraries are being used in the current JavaScript context, this will return an empty + set.
        +
        +
        Returns:
        +
        The set of custom resource IDs that the current JavaScript context is using.
        +
        +
      • +
      + + + +
        +
      • +

        getClassLoader

        +
        public ClassLoader getClassLoader()
        +
        Returns the application classloader that the current JavaScript context is using.
        +
        +
        Returns:
        +
        The application classloader that the current JavaScript context is using.
        +
        +
      • +
      + + + +
        +
      • +

        getIsolatedClassLoader

        +
        public ClassLoader getIsolatedClassLoader()
        +
        Returns a classloader containing only the libraries contained in the custom resources, with + no parent classloader. If no custom libraries are being used in the current JavaScript + context, this will return null.
        +
        +
        Returns:
        +
        A classloader containing only the libraries contained in the custom resources, with + no parent classloader.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DICOMUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DICOMUtil.html new file mode 100644 index 0000000000..2897d8a4b1 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DICOMUtil.html @@ -0,0 +1,634 @@ + + + + + +DICOMUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class DICOMUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class DICOMUtil
    +extends Object
    +
    Provides DICOM utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getDICOMRawData

        +
        public static String getDICOMRawData(ImmutableConnectorMessage connectorMessage)
        +
        Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a Base64-encoded string.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        Returns:
        +
        The merged DICOM data, Base64-encoded.
        +
        +
      • +
      + + + +
        +
      • +

        getDICOMRawBytes

        +
        public static byte[] getDICOMRawBytes(ImmutableConnectorMessage connectorMessage)
        +
        Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a byte array.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        Returns:
        +
        The merged DICOM data as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        getDICOMMessage

        +
        public static byte[] getDICOMMessage(ImmutableConnectorMessage connectorMessage)
        +
        Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a byte array.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        Returns:
        +
        The merged DICOM data as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        mergeHeaderAttachments

        +
        public static String mergeHeaderAttachments(ImmutableConnectorMessage connectorMessage,
        +                                            List<Attachment> attachments)
        +                                     throws com.mirth.connect.donkey.model.message.MessageSerializerException,
        +                                            IOException
        +
        Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a Base-64 encoded String.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message containing header data to merge DICOM attachments with.
        +
        attachments - The DICOM attachments to merge with the header data.
        +
        Returns:
        +
        The merged DICOM data as a Base-64 encoded String.
        +
        Throws:
        +
        com.mirth.connect.donkey.model.message.MessageSerializerException - If a database access error occurs, or the DICOM data could not be parsed.
        +
        IOException - If Base64 encoding failed.
        +
        +
      • +
      + + + +
        +
      • +

        mergeHeaderPixelData

        +
        public static String mergeHeaderPixelData(byte[] header,
        +                                          List<byte[]> images)
        +                                   throws IOException
        +
        Re-attaches DICOM attachments with the given header data and returns the resulting merged + data as a Base-64 encoded String.
        +
        +
        Parameters:
        +
        header - The header data to merge DICOM attachments with.
        +
        images - The DICOM attachments as byte arrays to merge with the header data.
        +
        Returns:
        +
        The merged DICOM data as a Base-64 encoded String.
        +
        Throws:
        +
        IOException - If Base64 encoding failed.
        +
        +
      • +
      + + + +
        +
      • +

        getSliceCount

        +
        public static int getSliceCount(ImmutableConnectorMessage connectorMessage)
        +
        Returns the number of slices in the fully-merged DICOM data associated with a given connector + message.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message to retrieve DICOM data for.
        +
        Returns:
        +
        The number of slices in the DICOM data.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOM

        +
        public static String convertDICOM(String imageType,
        +                                  ImmutableConnectorMessage connectorMessage,
        +                                  boolean autoThreshold)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        autoThreshold - If true, automatically sets the lower and upper threshold levels.
        +
        Returns:
        +
        The converted image, as a Base64-encoded string.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOM

        +
        public static String convertDICOM(String imageType,
        +                                  ImmutableConnectorMessage connectorMessage)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        Returns:
        +
        The converted image, as a Base64-encoded string.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOM

        +
        public static String convertDICOM(String imageType,
        +                                  ImmutableConnectorMessage connectorMessage,
        +                                  int sliceIndex)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        sliceIndex - If there are multiple slices in the DICOM data, this indicates which one to use + (the first slice has an index of 1).
        +
        Returns:
        +
        The converted image, as a Base64-encoded string.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOM

        +
        public static String convertDICOM(String imageType,
        +                                  ImmutableConnectorMessage connectorMessage,
        +                                  int sliceIndex,
        +                                  boolean autoThreshold)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        sliceIndex - If there are multiple slices in the DICOM data, this indicates which one to use + (the first slice has an index of 1).
        +
        autoThreshold - If true, automatically sets the lower and upper threshold levels.
        +
        Returns:
        +
        The converted image, as a Base64-encoded string.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOMToByteArray

        +
        public static byte[] convertDICOMToByteArray(String imageType,
        +                                             ImmutableConnectorMessage connectorMessage)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        Returns:
        +
        The converted image, as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOMToByteArray

        +
        public static byte[] convertDICOMToByteArray(String imageType,
        +                                             ImmutableConnectorMessage connectorMessage,
        +                                             int sliceIndex)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        sliceIndex - If there are multiple slices in the DICOM data, this indicates which one to use + (the first slice has an index of 1).
        +
        Returns:
        +
        The converted image, as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        convertDICOMToByteArray

        +
        public static byte[] convertDICOMToByteArray(String imageType,
        +                                             ImmutableConnectorMessage connectorMessage,
        +                                             int sliceIndex,
        +                                             boolean autoThreshold)
        +
        Converts merged DICOM data associated with a connector message into a specified image format.
        +
        +
        Parameters:
        +
        imageType - The image format to convert the DICOM data to (e.g. "jpg").
        +
        connectorMessage - The connector message to retrieve merged DICOM data for.
        +
        sliceIndex - If there are multiple slices in the DICOM data, this indicates which one to use + (the first slice has an index of 1).
        +
        autoThreshold - If true, automatically sets the lower and upper threshold levels.
        +
        Returns:
        +
        The converted image, as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        byteArrayToDicomObject

        +
        public static org.dcm4che2.data.DicomObject byteArrayToDicomObject(byte[] bytes,
        +                                                                   boolean decodeBase64)
        +                                                            throws IOException
        +
        Converts a byte array into a dcm4che DicomObject.
        +
        +
        Parameters:
        +
        bytes - The binary data to convert.
        +
        decodeBase64 - If true, the data is assumed to be Base64-encoded.
        +
        Returns:
        +
        The converted DicomObject.
        +
        Throws:
        +
        IOException - If Base64 encoding failed.
        +
        +
      • +
      + + + +
        +
      • +

        dicomObjectToByteArray

        +
        public static byte[] dicomObjectToByteArray(org.dcm4che2.data.DicomObject dicomObject)
        +                                     throws IOException
        +
        Converts a dcm4che DicomObject into a byte array.
        +
        +
        Parameters:
        +
        dicomObject - The DicomObject to convert.
        +
        Returns:
        +
        The converted byte array.
        +
        Throws:
        +
        IOException - If Base64 encoding failed.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnection.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnection.html new file mode 100644 index 0000000000..3228aae86f --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnection.html @@ -0,0 +1,638 @@ + + + + + +DatabaseConnection + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class DatabaseConnection

+
+
+ +
+
    +
  • +
    +
    +
    public class DatabaseConnection
    +extends Object
    +
    Provides the ability to run SQL queries again the database connection object instantiated using + DatabaseConnectionFactory.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        DatabaseConnection

        +
        public DatabaseConnection(String address)
        +                   throws SQLException
        +
        Instantiates a new database connection with the given server address.
        +
        +
        Parameters:
        +
        address - The server address to connect to.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        DatabaseConnection

        +
        public DatabaseConnection(String address,
        +                          Properties info)
        +                   throws SQLException
        +
        Instantiates a new database connection with the given server address and connection + arguments.
        +
        +
        Parameters:
        +
        address - The server address to connect to.
        +
        info - A Properties object containing all applicable connection arguments.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        DatabaseConnection

        +
        public DatabaseConnection(Driver driver,
        +                          String address)
        +                   throws SQLException
        +
        Instantiates a new database connection with the given driver instance and server address.
        +
        +
        Parameters:
        +
        driver - The explicit driver instance to connect with.
        +
        address - The server address to connect to.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        DatabaseConnection

        +
        public DatabaseConnection(Driver driver,
        +                          String address,
        +                          Properties info)
        +                   throws SQLException
        +
        Instantiates a new database connection with the given driver instance, server address, and + connection arguments.
        +
        +
        Parameters:
        +
        driver - The explicit driver instance to connect with.
        +
        address - The server address to connect to.
        +
        info - A Properties object containing all applicable connection arguments.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getAddress

        +
        public String getAddress()
        +
        Returns the server address.
        +
        +
        Returns:
        +
        The server address.
        +
        +
      • +
      + + + +
        +
      • +

        executeCachedQuery

        +
        public CachedRowSet executeCachedQuery(String expression)
        +                                throws SQLException
        +
        Executes a query on the database and returns a CachedRowSet.
        +
        +
        Parameters:
        +
        expression - The query expression to be executed.
        +
        Returns:
        +
        The result of the query, as a CachedRowSet.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        executeUpdate

        +
        public int executeUpdate(String expression)
        +                  throws SQLException
        +
        Executes an INSERT/UPDATE on the database and returns the row count.
        +
        +
        Parameters:
        +
        expression - The statement to be executed.
        +
        Returns:
        +
        A count of the number of updated rows.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        executeUpdate

        +
        public int executeUpdate(String expression,
        +                         List<Object> parameters)
        +                  throws SQLException
        +
        Executes a prepared INSERT/UPDATE statement on the database and returns the row count.
        +
        +
        Parameters:
        +
        expression - The prepared statement to be executed.
        +
        parameters - The parameters for the prepared statement.
        +
        Returns:
        +
        A count of the number of updated rows.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        executeCachedQuery

        +
        public CachedRowSet executeCachedQuery(String expression,
        +                                       List<Object> parameters)
        +                                throws SQLException
        +
        Executes a prepared query on the database and returns a CachedRowSet.
        +
        +
        Parameters:
        +
        expression - The prepared statement to be executed.
        +
        parameters - The parameters for the prepared statement.
        +
        Returns:
        +
        The result of the query, as a CachedRowSet.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        close

        +
        public void close()
        +
        Closes the database connection.
        +
      • +
      + + + +
        +
      • +

        setAutoCommit

        +
        public void setAutoCommit(boolean autoCommit)
        +                   throws SQLException
        +
        Sets this connection's auto-commit mode to the given state.
        +
        +
        Parameters:
        +
        autoCommit - The value (true or false) to set the connection's auto-commit mode to.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        rollback

        +
        public void rollback()
        +              throws SQLException
        +
        Undoes all changes made in the current transaction and releases any database locks currently + held by this Connection object.
        +
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        commit

        +
        public void commit()
        +            throws SQLException
        +
        Makes all changes made since the previous commit/rollback permanent and releases any database + locks currently held by this DatabaseConnection object.
        +
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        executeUpdateAndGetGeneratedKeys

        +
        public CachedRowSet executeUpdateAndGetGeneratedKeys(String expression)
        +                                              throws SQLException
        +
        Executes an INSERT/UPDATE statement on the database and returns a CachedRowSet containing any + generated keys.
        +
        +
        Parameters:
        +
        expression - The statement to be executed.
        +
        Returns:
        +
        A CachedRowSet containing any generated keys.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        executeUpdateAndGetGeneratedKeys

        +
        public CachedRowSet executeUpdateAndGetGeneratedKeys(String expression,
        +                                                     List<Object> parameters)
        +                                              throws SQLException
        +
        Executes a prepared INSERT/UPDATE statement on the database and returns a CachedRowSet + containing any generated keys.
        +
        +
        Parameters:
        +
        expression - The prepared statement to be executed.
        +
        parameters - The parameters for the prepared statement.
        +
        Returns:
        +
        A CachedRowSet containing any generated keys.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        getConnection

        +
        public Connection getConnection()
        +
        Returns the database connection (java.sql.Connection) this class is using.
        +
        +
        Returns:
        +
        The underlying java.sql.Connection object.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnectionFactory.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnectionFactory.html new file mode 100644 index 0000000000..73b802f9ae --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DatabaseConnectionFactory.html @@ -0,0 +1,383 @@ + + + + + +DatabaseConnectionFactory + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class DatabaseConnectionFactory

+
+
+ +
+
    +
  • +
    +
    +
    public class DatabaseConnectionFactory
    +extends Object
    +
    Used to create database connection objects.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        DatabaseConnectionFactory

        +
        public DatabaseConnectionFactory(com.mirth.connect.server.util.javascript.MirthContextFactory contextFactory)
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        createDatabaseConnection

        +
        public DatabaseConnection createDatabaseConnection(String driver,
        +                                                   String address,
        +                                                   String username,
        +                                                   String password)
        +                                            throws SQLException
        +
        Instantiates and returns a new DatabaseConnection object with the given connection + parameters.
        +
        +
        Parameters:
        +
        driver - The JDBC driver class (as a string) to use to create the connection with.
        +
        address - The server address to connect to.
        +
        username - The username to connect with.
        +
        password - The password to connect with.
        +
        Returns:
        +
        The created DatabaseConnection object.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        createDatabaseConnection

        +
        public DatabaseConnection createDatabaseConnection(String driver,
        +                                                   String address)
        +                                            throws SQLException
        +
        Instantiates and returns a new DatabaseConnection object with the given connection + parameters.
        +
        +
        Parameters:
        +
        driver - The JDBC driver class (as a string) to use to create the connection with.
        +
        address - The server address to connect to.
        +
        Returns:
        +
        The created DatabaseConnection object.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        createConnection

        +
        public Connection createConnection(String driver,
        +                                   String address,
        +                                   String username,
        +                                   String password)
        +                            throws SQLException
        +
        Instantiates and returns a new java.sql.Connection object with the given connection + parameters.
        +
        +
        Parameters:
        +
        driver - The JDBC driver class (as a string) to use to create the connection with.
        +
        address - The server address to connect to.
        +
        username - The username to connect with.
        +
        password - The password to connect with.
        +
        Returns:
        +
        The created DatabaseConnection object.
        +
        Throws:
        +
        SQLException - If a database access error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        initializeDriver

        +
        public void initializeDriver(String driver)
        +                      throws Exception
        +
        Initializes the specified JDBC driver. This can be used in JavaScript contexts where + "Class.forName" can't be called directly.
        +
        +
        Parameters:
        +
        driver - The JDBC driver class (as a string) to initialize.
        +
        Throws:
        +
        Exception - If the driver could not be initialized.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DateUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DateUtil.html new file mode 100644 index 0000000000..1d77012cfa --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DateUtil.html @@ -0,0 +1,333 @@ + + + + + +DateUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class DateUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class DateUtil
    +extends Object
    +
    Provides date/time utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getDate

        +
        public static Date getDate(String pattern,
        +                           String date)
        +                    throws Exception
        +
        Parses a date string according to the specified pattern and returns a java.util.Date object.
        +
        +
        Parameters:
        +
        pattern - The SimpleDateFormat pattern to use (e.g. "yyyyMMddHHmmss").
        +
        date - The date string to parse.
        +
        Returns:
        +
        A java.util.Date object representing the parsed date.
        +
        Throws:
        +
        Exception - If the pattern could not be parsed.
        +
        +
      • +
      + + + +
        +
      • +

        formatDate

        +
        public static String formatDate(String pattern,
        +                                Date date)
        +
        Formats a java.util.Date object into a string according to a specified pattern.
        +
        +
        Parameters:
        +
        pattern - The SimpleDateFormat pattern to use (e.g. "yyyyMMddHHmmss").
        +
        date - The java.util.Date object to format.
        +
        Returns:
        +
        The formatted date string.
        +
        +
      • +
      + + + +
        +
      • +

        getCurrentDate

        +
        public static String getCurrentDate(String pattern)
        +
        Formats the current date into a string according to a specified pattern.
        +
        +
        Parameters:
        +
        pattern - The SimpleDateFormat pattern to use (e.g. "yyyyMMddHHmmss").
        +
        Returns:
        +
        The current formatted date string.
        +
        +
      • +
      + + + +
        +
      • +

        convertDate

        +
        public static String convertDate(String inPattern,
        +                                 String outPattern,
        +                                 String date)
        +                          throws Exception
        +
        Parses a date string according to a specified input pattern, and formats the date back to a + string according to a specified output pattern.
        +
        +
        Parameters:
        +
        inPattern - The SimpleDateFormat pattern to use for parsing the inbound date string (e.g. + "yyyyMMddHHmmss").
        +
        outPattern - The SimpleDateFormat pattern to use for formatting the outbound date string (e.g. + "yyyyMMddHHmmss").
        +
        date - The date string to convert.
        +
        Returns:
        +
        The converted date string.
        +
        Throws:
        +
        Exception - If the pattern could not be parsed.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DeployedState.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DeployedState.html new file mode 100644 index 0000000000..460b63d1aa --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DeployedState.html @@ -0,0 +1,466 @@ + + + + + +DeployedState + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Enum DeployedState

+
+
+ +
+ +
+
+ +
+
+
    +
  • + + + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        values

        +
        public static DeployedState[] values()
        +
        Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
        +for (DeployedState c : DeployedState.values())
        +    System.out.println(c);
        +
        +
        +
        Returns:
        +
        an array containing the constants of this enum type, in the order they are declared
        +
        +
      • +
      + + + +
        +
      • +

        valueOf

        +
        public static DeployedState valueOf(String name)
        +
        Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
        +
        +
        Parameters:
        +
        name - the name of the enum constant to be returned.
        +
        Returns:
        +
        the enum constant with the specified name
        +
        Throws:
        +
        IllegalArgumentException - if this enum type has no constant with the specified name
        +
        NullPointerException - if the argument is null
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DestinationSet.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DestinationSet.html new file mode 100644 index 0000000000..8af9ad0a2b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/DestinationSet.html @@ -0,0 +1,384 @@ + + + + + +DestinationSet + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class DestinationSet

+
+
+ +
+
    +
  • +
    +
    +
    public class DestinationSet
    +extends Object
    +
    Utility class used in the preprocessor or source filter/transformer to prevent the message from + being sent to specific destinations.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        DestinationSet

        +
        public DestinationSet(ImmutableConnectorMessage connectorMessage)
        +
        DestinationSet instances should NOT be constructed manually. The instance "destinationSet" + provided in the scope should be used.
        +
        +
        Parameters:
        +
        connectorMessage - The delegate ImmutableConnectorMessage object.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        remove

        +
        public boolean remove(Object metaDataIdOrConnectorName)
        +
        Stop a destination from being processed for this message.
        +
        +
        Parameters:
        +
        metaDataIdOrConnectorName - An integer representing the metaDataId of a destination connector, or the actual + destination connector name.
        +
        Returns:
        +
        A boolean indicating whether at least one destination connector was actually removed + from processing for this message.
        +
        +
      • +
      + + + +
        +
      • +

        remove

        +
        public boolean remove(Collection<Object> metaDataIdOrConnectorNames)
        +
        Stop a destination from being processed for this message.
        +
        +
        Parameters:
        +
        metaDataIdOrConnectorNames - A collection of integers representing the metaDataId of a destination connectors, + or the actual destination connector names. JavaScript arrays can be used.
        +
        Returns:
        +
        A boolean indicating whether at least one destination connector was actually removed + from processing for this message.
        +
        +
      • +
      + + + +
        +
      • +

        removeAllExcept

        +
        public boolean removeAllExcept(Object metaDataIdOrConnectorName)
        +
        Stop all except one destination from being processed for this message.
        +
        +
        Parameters:
        +
        metaDataIdOrConnectorName - An integer representing the metaDataId of a destination connector, or the actual + destination connector name.
        +
        Returns:
        +
        A boolean indicating whether at least one destination connector was actually removed + from processing for this message.
        +
        +
      • +
      + + + +
        +
      • +

        removeAllExcept

        +
        public boolean removeAllExcept(Collection<Object> metaDataIdOrConnectorNames)
        +
        Stop all except one destination from being processed for this message.
        +
        +
        Parameters:
        +
        metaDataIdOrConnectorNames - A collection of integers representing the metaDataId of a destination connectors, + or the actual destination connector names. JavaScript arrays can be used.
        +
        Returns:
        +
        A boolean indicating whether at least one destination connector was actually removed + from processing for this message.
        +
        +
      • +
      + + + +
        +
      • +

        removeAll

        +
        public boolean removeAll()
        +
        Stop all destinations from being processed for this message. This does NOT mark the source + message as FILTERED.
        +
        +
        Returns:
        +
        A boolean indicating whether at least one destination connector was actually removed + from processing for this message.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptedData.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptedData.html new file mode 100644 index 0000000000..ee8da81f69 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptedData.html @@ -0,0 +1,292 @@ + + + + + +EncryptedData + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class EncryptedData

+
+
+ +
+ +
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        EncryptedData

        +
        public EncryptedData(String header,
        +                     byte[] encryptedData)
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getHeader

        +
        public String getHeader()
        +
        Returns the meta-information about the encrypted data. Includes the algorithm and + initialization vector used.
        +
      • +
      + + + +
        +
      • +

        getEncryptedData

        +
        public byte[] getEncryptedData()
        +
        Returns the encrypted data as a byte array.
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptionUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptionUtil.html new file mode 100644 index 0000000000..174dff0d93 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/EncryptionUtil.html @@ -0,0 +1,363 @@ + + + + + +EncryptionUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class EncryptionUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class EncryptionUtil
    +extends Object
    +
    This utility class provides some convenience methods for encrypting or decrypting data.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        EncryptionUtil

        +
        public EncryptionUtil()
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        encrypt

        +
        public static String encrypt(String data)
        +                      throws com.mirth.commons.encryption.EncryptionException
        +
        Convenience method for encrypting data. Uses the currently configured encryption settings.
        +
        +
        Parameters:
        +
        data - The data to encrypt, as a String.
        +
        Returns:
        +
        The encrypted data.
        +
        Throws:
        +
        com.mirth.commons.encryption.EncryptionException - If the data cannot be encrypted for any reason.
        +
        +
      • +
      + + + +
        +
      • +

        encrypt

        +
        public static EncryptedData encrypt(byte[] data)
        +                             throws com.mirth.commons.encryption.EncryptionException
        +
        Convenience method for encrypting data. Uses the currently configured encryption settings.
        +
        +
        Parameters:
        +
        data - The data to encrypt, as a raw byte array.
        +
        Returns:
        +
        An EncryptedData object containing the header information and encrypted data.
        +
        Throws:
        +
        com.mirth.commons.encryption.EncryptionException - If the data cannot be encrypted for any reason.
        +
        +
      • +
      + + + +
        +
      • +

        decrypt

        +
        public static String decrypt(String data)
        +                      throws com.mirth.commons.encryption.EncryptionException
        +
        Convenience method for decrypting data. Uses the currently configured encryption and fallback + settings.
        +
        +
        Parameters:
        +
        data - The data to decrypt, as a String.
        +
        Returns:
        +
        The decrypted data.
        +
        Throws:
        +
        com.mirth.commons.encryption.EncryptionException - If the data cannot be decrypted for any reason.
        +
        +
      • +
      + + + +
        +
      • +

        decrypt

        +
        public static byte[] decrypt(String header,
        +                             byte[] data)
        +                      throws com.mirth.commons.encryption.EncryptionException
        +
        Convenience method for decrypting data. Uses the currently configured encryption and fallback + settings.
        +
        +
        Parameters:
        +
        header - The meta-information about the encrypted data. This is a specially-formatted + string returned from the encrypt(byte[]) method.
        +
        data - The data to decrypt, as a raw byte array.
        +
        Returns:
        +
        The decrypted data.
        +
        Throws:
        +
        com.mirth.commons.encryption.EncryptionException - If the data cannot be decrypted for any reason.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/FileUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/FileUtil.html new file mode 100644 index 0000000000..318eb8f27d --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/FileUtil.html @@ -0,0 +1,446 @@ + + + + + +FileUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class FileUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class FileUtil
    +extends Object
    +
    Provides file utility methods.
    +
    +
    See Also:
    +
    FileUtils
    +
    +
  • +
+
+
+
    +
  • + + +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        write

        +
        public static void write(String fileName,
        +                         boolean append,
        +                         String data)
        +                  throws IOException
        +
        Writes a string to a specified file, creating the file if it does not exist.
        +
        +
        Parameters:
        +
        fileName - The pathname string of the file to write to.
        +
        append - If true, the data will be added to the end of the file rather than overwriting the + file.
        +
        data - The content to write to the file.
        +
        Throws:
        +
        IOException - If an I/O error occurred.
        +
        See Also:
        +
        FileUtils.writeStringToFile(File, String)
        +
        +
      • +
      + + + +
        +
      • +

        decode

        +
        public static byte[] decode(String data)
        +
        Decodes a Base64 string into octets.
        +
        +
        Parameters:
        +
        data - The Base64 string to decode.
        +
        Returns:
        +
        The decoded data, as a byte array.s
        +
        +
      • +
      + + + +
        +
      • +

        encode

        +
        public static String encode(byte[] data)
        +
        Encoded binary data into a Base64 string.
        +
        +
        Parameters:
        +
        data - The binary data to encode (byte array).
        +
        Returns:
        +
        The encoded Base64 string.
        +
        +
      • +
      + + + +
        +
      • +

        write

        +
        public static void write(String fileName,
        +                         boolean append,
        +                         byte[] bytes)
        +                  throws IOException
        +
        Writes a byte array to a file, creating the file if it does not exist.
        +
        +
        Parameters:
        +
        fileName - The pathname string of the file to write to.
        +
        append - If true, the data will be added to the end of the file rather than overwriting the + file.
        +
        bytes - The binary content to write to the file.
        +
        Throws:
        +
        IOException - If an I/O error occurred.
        +
        See Also:
        +
        FileUtils.writeByteArrayToFile(File, byte[])
        +
        +
      • +
      + + + +
        +
      • +

        readBytes

        +
        public static byte[] readBytes(String fileName)
        +                        throws IOException
        +
        Returns the contents of the file as a byte array.
        +
        +
        Parameters:
        +
        fileName - The pathname string of the file to read from.
        +
        Returns:
        +
        The byte array representation of the file.
        +
        Throws:
        +
        IOException - If an I/O error occurred.
        +
        See Also:
        +
        FileUtils.readFileToByteArray(File)
        +
        +
      • +
      + + + +
        +
      • +

        read

        +
        public static String read(String fileName)
        +                   throws IOException
        +
        Returns the contents of the file as a string, using the system default charset encoding.
        +
        +
        Parameters:
        +
        fileName - The pathname string of the file to read from.
        +
        Returns:
        +
        The string representation of the file.
        +
        Throws:
        +
        IOException - If an I/O error occurred.
        +
        See Also:
        +
        FileUtils.readFileToString(File)
        +
        +
      • +
      + + + +
        +
      • +

        deleteFile

        +
        public static boolean deleteFile(File file)
        +                          throws SecurityException
        +
        Deletes a specified File. In Rhino and E4X 'delete' is a keyword, so File.delete() can't be + called within Mirth directly.
        +
        +
        Parameters:
        +
        file - The File to delete.
        +
        Returns:
        +
        true if and only if the file or directory is successfully deleted; false otherwise
        +
        Throws:
        +
        SecurityException - If the security manager denies access to delete the file.
        +
        +
      • +
      + + + +
        +
      • +

        rtfToPlainText

        +
        public static String rtfToPlainText(String message,
        +                                    String replaceLinebreaksWith)
        +                             throws IOException,
        +                                    BadLocationException
        +
        Converts an RTF into plain text using the Swing RTFEditorKit.
        +
        +
        Parameters:
        +
        message - The RTF message to convert.
        +
        replaceLinebreaksWith - If not null, any line breaks in the converted message will be replaced with this + string.
        +
        Returns:
        +
        The converted plain text message.
        +
        Throws:
        +
        IOException - If an I/O error occurred.
        +
        BadLocationException - If an invalid location within the document is used.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Future.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Future.html new file mode 100644 index 0000000000..2779d8bb50 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/Future.html @@ -0,0 +1,417 @@ + + + + + +Future + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class Future<V>

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Future<V>
    +
    +
    +
    +
    public class Future<V>
    +extends Object
    +implements Future<V>
    +
    A Future represents the result of an asynchronous computation. Methods are provided to + check if the computation is complete, to wait for its completion, and to retrieve the result of + the computation. The result can only be retrieved using method get when the computation + has completed, blocking if necessary until it is ready. Cancellation is performed by the + cancel method. Additional methods are provided to determine if the task completed + normally or was cancelled. Once a computation has completed, the computation cannot be cancelled. + If you would like to use a Future for the sake of cancellability but not provide a usable + result, you can declare types of the form Future<?> and return null as a result + of the underlying task.
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      booleancancel(boolean mayInterruptIfRunning) +
      Attempts to cancel execution of this task.
      +
      Vget() +
      Waits if necessary for the computation to complete, and then retrieves its result.
      +
      Vget(long timeoutInMillis) +
      Waits if necessary for at most the given time for the computation to complete, and then + retrieves its result, if available.
      +
      Vget(long timeout, + TimeUnit unit) +
      Waits if necessary for at most the given time for the computation to complete, and then + retrieves its result, if available.
      +
      booleanisCancelled() +
      Returns true if this task was cancelled before it completed normally.
      +
      booleanisDone() +
      Returns true if this task completed.
      +
      + +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        cancel

        +
        public boolean cancel(boolean mayInterruptIfRunning)
        +
        Attempts to cancel execution of this task. This attempt will fail if the task has already + completed, has already been cancelled, or could not be cancelled for some other reason. If + successful, and this task has not started when cancel is called, this task should + never run. If the task has already started, then the mayInterruptIfRunning parameter + determines whether the thread executing this task should be interrupted in an attempt to stop + the task. + + After this method returns, subsequent calls to isDone() will always return + true. Subsequent calls to isCancelled() will always return true if + this method returned true.
        +
        +
        Specified by:
        +
        cancel in interface Future<V>
        +
        Parameters:
        +
        mayInterruptIfRunning - true if the thread executing this task should be interrupted; otherwise, + in-progress tasks are allowed to complete
        +
        Returns:
        +
        false if the task could not be cancelled, typically because it has already + completed normally; true otherwise
        +
        +
      • +
      + + + +
        +
      • +

        isCancelled

        +
        public boolean isCancelled()
        +
        Returns true if this task was cancelled before it completed normally.
        +
        +
        Specified by:
        +
        isCancelled in interface Future<V>
        +
        Returns:
        +
        true if this task was cancelled before it completed
        +
        +
      • +
      + + + +
        +
      • +

        isDone

        +
        public boolean isDone()
        +
        Returns true if this task completed. + + Completion may be due to normal termination, an exception, or cancellation -- in all of these + cases, this method will return true.
        +
        +
        Specified by:
        +
        isDone in interface Future<V>
        +
        Returns:
        +
        true if this task completed
        +
        +
      • +
      + + + + + + + + + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HTTPUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HTTPUtil.html new file mode 100644 index 0000000000..681a7480dc --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HTTPUtil.html @@ -0,0 +1,318 @@ + + + + + +HTTPUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class HTTPUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class HTTPUtil
    +extends Object
    +
    Provides HTTP utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        parseHeaders

        +
        public static Map<String,String> parseHeaders(String str)
        +                                       throws Exception
        +
        Converts a block of HTTP header fields into a Map containing each header key and value.
        +
        +
        Parameters:
        +
        str - The block of HTTP header fields to convert.
        +
        Returns:
        +
        The converted Map containing header key-value pairs.
        +
        Throws:
        +
        Exception - If the header string could not be parsed.
        +
        +
      • +
      + + + +
        +
      • +

        httpBodyToXml

        +
        public static String httpBodyToXml(InputStream httpBody,
        +                                   String contentType)
        +                            throws javax.mail.MessagingException,
        +                                   IOException,
        +                                   com.mirth.connect.donkey.util.DonkeyElement.DonkeyElementException,
        +                                   ParserConfigurationException
        +
        Serializes an HTTP request body into XML. Multipart requests will also automatically be + parsed into separate XML nodes.
        +
        +
        Parameters:
        +
        httpBody - The request body/payload input stream to parse.
        +
        contentType - The MIME content type of the request.
        +
        Returns:
        +
        The serialized XML string.
        +
        Throws:
        +
        javax.mail.MessagingException - If the body could not be converted into a multipart object.
        +
        IOException - If the body could not be read into a string.
        +
        com.mirth.connect.donkey.util.DonkeyElement.DonkeyElementException - If an XML parsing error occurs.
        +
        ParserConfigurationException - If an XML or multipart parsing error occurs.
        +
        +
      • +
      + + + +
        +
      • +

        httpBodyToXml

        +
        public static String httpBodyToXml(String httpBody,
        +                                   String contentType)
        +                            throws javax.mail.MessagingException,
        +                                   IOException,
        +                                   com.mirth.connect.donkey.util.DonkeyElement.DonkeyElementException,
        +                                   ParserConfigurationException
        +
        Serializes an HTTP request body into XML. Multipart requests will also automatically be + parsed into separate XML nodes.
        +
        +
        Parameters:
        +
        httpBody - The request body/payload string to parse.
        +
        contentType - The MIME content type of the request.
        +
        Returns:
        +
        The serialized XML string.
        +
        Throws:
        +
        javax.mail.MessagingException - If the body could not be converted into a multipart object.
        +
        IOException - If the body could not be read into a string.
        +
        com.mirth.connect.donkey.util.DonkeyElement.DonkeyElementException - If an XML parsing error occurs.
        +
        ParserConfigurationException - If an XML or multipart parsing error occurs.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HashUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HashUtil.html new file mode 100644 index 0000000000..3196a6cd4c --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/HashUtil.html @@ -0,0 +1,310 @@ + + + + + +HashUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class HashUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class HashUtil
    +extends Object
    +
    Provides hash utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        generate

        +
        public static String generate(Object data)
        +                       throws Exception
        +
        Takes in any object and generates a SHA-256 hex hash.
        +
        +
        Parameters:
        +
        data - The data to hash.
        +
        Returns:
        +
        hash + The generated SHA-256 hex hash of the data.
        +
        Throws:
        +
        Exception - If generating a SHA-256 hex hash fails.
        +
        +
      • +
      + + + +
        +
      • +

        generate

        +
        public static String generate(String str,
        +                              String encoding,
        +                              String algorithm)
        +                       throws Exception
        +
        Takes in a string, an encoding, and a hashing algorithm and generates a hex hash.
        +
        +
        Parameters:
        +
        str - The string to hash.
        +
        encoding - The character encoding to use.
        +
        algorithm - The hashing algorithm to use.
        +
        Returns:
        +
        hash + The generated hex hash of the string.
        +
        Throws:
        +
        Exception - If generating a hex hash of the string fails.
        +
        +
      • +
      + + + +
        +
      • +

        generate

        +
        public static String generate(byte[] bytes,
        +                              String algorithm)
        +                       throws Exception
        +
        Takes in a byte[], an encoding, and a hashing algorithm and generates a hex hash.
        +
        +
        Parameters:
        +
        bytes - The byte[] to hash.
        +
        algorithm - The hashing algorithm to use.
        +
        Returns:
        +
        hash + The generated hex hash of the byte[].
        +
        Throws:
        +
        Exception - If generating a hex hash of the byte[] fails.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ImmutableResponse.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ImmutableResponse.html new file mode 100644 index 0000000000..f82f8dd834 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ImmutableResponse.html @@ -0,0 +1,346 @@ + + + + + +ImmutableResponse + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ImmutableResponse

+
+
+ +
+
    +
  • +
    +
    +
    public class ImmutableResponse
    +extends Object
    +
    This class represents a destination response and is used to retrieve details such as the response + data, message status, and errors.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ImmutableResponse

        +
        public ImmutableResponse(Response response)
        +
        Instantiates a new ImmutableResponse object.
        +
        +
        Parameters:
        +
        response - The Response object that this object will reference for retrieving data.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getMessage

        +
        public String getMessage()
        +
        Returns the actual response data, as a string.
        +
        +
        Returns:
        +
        The actual response data, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getNewMessageStatus

        +
        public Status getNewMessageStatus()
        +
        Returns the Status (e.g. SENT, QUEUED) of this response, which will be used to set the status + of the corresponding connector message.
        +
        +
        Returns:
        +
        The Status (e.g. SENT, QUEUED) of this response.
        +
        +
      • +
      + + + +
        +
      • +

        getError

        +
        public String getError()
        +
        Returns the error string associated with this response, if it exists.
        +
        +
        Returns:
        +
        The error string associated with this response, if it exists.
        +
        +
      • +
      + + + +
        +
      • +

        getStatusMessage

        +
        public String getStatusMessage()
        +
        Returns a brief message explaining the reason for the current status.
        +
        +
        Returns:
        +
        A brief message explaining the reason for the current status.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/MirthCachedRowSet.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/MirthCachedRowSet.html new file mode 100644 index 0000000000..b77867880e --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/MirthCachedRowSet.html @@ -0,0 +1,7869 @@ + + + + + +MirthCachedRowSet + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class MirthCachedRowSet

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    AutoCloseable, ResultSet, Wrapper, RowSet, CachedRowSet, Joinable
    +
    +
    +
    +
    public class MirthCachedRowSet
    +extends Object
    +implements CachedRowSet
    +
    An implementation of CachedRowSet that retrieves values based on the column label value. + CachedRowSetImpl uses the column name which ignores alias for drivers that correctly follow the + JDBC 4.0 recommendations. Using the column label ensures that aliases will work for these + drivers.
    +
  • +
+
+
+ +
+
+ +
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/NCPDPUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/NCPDPUtil.html new file mode 100644 index 0000000000..d271fd346b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/NCPDPUtil.html @@ -0,0 +1,250 @@ + + + + + +NCPDPUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class NCPDPUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class NCPDPUtil
    +extends Object
    +
    Provides NCPDP utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        formatNCPDPNumber

        +
        public static String formatNCPDPNumber(String origNumber,
        +                                       int decimalPoints)
        +
        Converts a signed overpunch code into a string representing the appropriate decimal value.
        +
        +
        Parameters:
        +
        origNumber - The signed overpunch code to convert.
        +
        decimalPoints - The index at which to place a decimal point in the converted string. If this value + is less than or equal to zero, or greater than or equal to the length of the + overpunch code, a decimal point will not be inserted.
        +
        Returns:
        +
        The string representation of the converted decimal value.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/RawMessage.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/RawMessage.html new file mode 100644 index 0000000000..fcd988f4cb --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/RawMessage.html @@ -0,0 +1,598 @@ + + + + + +RawMessage + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class RawMessage

+
+
+ +
+
    +
  • +
    +
    +
    public class RawMessage
    +extends Object
    +
    This class represents a raw message as it is received by a channel, and is used to retrieve + details such as the raw data or source map.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(String rawData)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawData - The textual data to dispatch to the channel.
        +
        +
      • +
      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(String rawData,
        +                  Collection<Number> destinationMetaDataIds)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawData - The textual data to dispatch to the channel.
        +
        destinationMetaDataIds - A collection of integers (metadata IDs) representing which destinations to + dispatch the message to. JavaScript arrays can be used.
        +
        +
      • +
      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(String rawData,
        +                  Collection<Number> destinationMetaDataIds,
        +                  Map<String,Object> sourceMap)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawData - The textual data to dispatch to the channel.
        +
        destinationMetaDataIds - A collection of integers (metadata IDs) representing which destinations to + dispatch the message to. JavaScript arrays can be used.
        +
        sourceMap - Any values placed in this map will be populated in the source map at the beginning + of the message's lifecycle.
        +
        +
      • +
      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(byte[] rawBytes)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawBytes - The binary data (byte array) to dispatch to the channel.
        +
        +
      • +
      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(byte[] rawBytes,
        +                  Collection<Number> destinationMetaDataIds)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawBytes - The binary data (byte array) to dispatch to the channel.
        +
        destinationMetaDataIds - A collection of integers (metadata IDs) representing which destinations to + dispatch the message to. JavaScript arrays can be used.
        +
        +
      • +
      + + + +
        +
      • +

        RawMessage

        +
        public RawMessage(byte[] rawBytes,
        +                  Collection<Number> destinationMetaDataIds,
        +                  Map<String,Object> sourceMap)
        +
        Instantiates a RawMessage object to dispatch to a channel.
        +
        +
        Parameters:
        +
        rawBytes - The binary data (byte array) to dispatch to the channel.
        +
        destinationMetaDataIds - A collection of integers (metadata IDs) representing which destinations to + dispatch the message to. JavaScript arrays can be used.
        +
        sourceMap - Any values placed in this map will be populated in the source map at the beginning + of the message's lifecycle.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getRawData

        +
        public String getRawData()
        +
        Returns the textual data to be dispatched to a channel.
        +
        +
        Returns:
        +
        The textual data to be dispatched to a channel.
        +
        +
      • +
      + + + +
        +
      • +

        getRawBytes

        +
        public byte[] getRawBytes()
        +
        Returns the binary data (byte array) to be dispatched to a channel.
        +
        +
        Returns:
        +
        The binary data (byte array) to be dispatched to a channel.
        +
        +
      • +
      + + + +
        +
      • +

        getDestinationMetaDataIds

        +
        public Collection<Integer> getDestinationMetaDataIds()
        +
        Returns the collection of integers (metadata IDs) representing which destinations to dispatch + the message to.
        +
        +
        Returns:
        +
        The collection of integers (metadata IDs) representing which destinations to dispatch + the message to.
        +
        +
      • +
      + + + +
        +
      • +

        setDestinationMetaDataIds

        +
        public void setDestinationMetaDataIds(Collection<Number> destinationMetaDataIds)
        +
        Sets which destinations to dispatch the message to.
        +
        +
        Parameters:
        +
        destinationMetaDataIds - A list of integers (metadata IDs) representing which destinations to dispatch the + message to.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelMap

        +
        @Deprecated
        +public Map<String,Object> getChannelMap()
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSourceMap() instead.
        +
        Returns the channel map to be used at the beginning of the channel dispatch.
        +
        +
        Returns:
        +
        The channel map to be used at the beginning of the channel dispatch.
        +
        +
      • +
      + + + +
        +
      • +

        setChannelMap

        +
        @Deprecated
        +public void setChannelMap(Map<String,Object> channelMap)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + setSourceMap(sourceMap) instead.
        +
        Sets the channel map to be used at the beginning of the channel dispatch.
        +
        +
        Parameters:
        +
        channelMap - Any values placed in this map will be populated in the channel map at the + beginning of the message's lifecycle.
        +
        +
      • +
      + + + +
        +
      • +

        getSourceMap

        +
        public Map<String,Object> getSourceMap()
        +
        Returns the source map to be used at the beginning of the channel dispatch.
        +
        +
        Returns:
        +
        The source map to be used at the beginning of the channel dispatch.
        +
        +
      • +
      + + + +
        +
      • +

        setSourceMap

        +
        public void setSourceMap(Map<String,Object> sourceMap)
        +
        Sets the source map to be used at the beginning of the channel dispatch.
        +
        +
        Parameters:
        +
        sourceMap - Any values placed in this map will be populated in the source map at the beginning + of the message's lifecycle.
        +
        +
      • +
      + + + +
        +
      • +

        isBinary

        +
        public Boolean isBinary()
        +
        Returns a Boolean representing whether this object contains textual or binary data.
        +
        +
        Returns:
        +
        A Boolean representing whether this object contains textual or binary data.
        +
        +
      • +
      + + + +
        +
      • +

        clearMessage

        +
        public void clearMessage()
        +
        Removes references to any data (textual or binary) currently stored by the raw message.
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ResponseFactory.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ResponseFactory.html new file mode 100644 index 0000000000..c9ebc68429 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/ResponseFactory.html @@ -0,0 +1,311 @@ + + + + + +ResponseFactory + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class ResponseFactory

+
+
+ +
+
    +
  • +
    +
    +
    public class ResponseFactory
    +extends Object
    +
    Provides methods to create Response objects.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getSentResponse

        +
        public static Response getSentResponse(String message)
        +
        Returns a Response representing a successfully sent message.
        +
        +
        Parameters:
        +
        message - The response data to store.
        +
        Returns:
        +
        The instantiated Response object.
        +
        +
      • +
      + + + +
        +
      • +

        getErrorResponse

        +
        public static Response getErrorResponse(String message)
        +
        Returns a Response representing a erred message.
        +
        +
        Parameters:
        +
        message - The response data to store.
        +
        Returns:
        +
        The instantiated Response object.
        +
        +
      • +
      + + + +
        +
      • +

        getFilteredResponse

        +
        public static Response getFilteredResponse(String message)
        +
        Returns a Response representing a filtered message.
        +
        +
        Parameters:
        +
        message - The response data to store.
        +
        Returns:
        +
        The instantiated Response object.
        +
        +
      • +
      + + + +
        +
      • +

        getQueuedResponse

        +
        public static Response getQueuedResponse(String message)
        +
        Returns a Response representing a queued message.
        +
        +
        Parameters:
        +
        message - The response data to store.
        +
        Returns:
        +
        The instantiated Response object.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnection.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnection.html new file mode 100644 index 0000000000..324f80ecb8 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnection.html @@ -0,0 +1,759 @@ + + + + + +SMTPConnection + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class SMTPConnection

+
+
+ +
+
    +
  • +
    +
    +
    public class SMTPConnection
    +extends Object
    +
    Used to send e-mail messages.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        SMTPConnection

        +
        public SMTPConnection(String host,
        +                      String port,
        +                      int socketTimeout,
        +                      boolean useAuthentication,
        +                      String secure,
        +                      String username,
        +                      String password,
        +                      String from)
        +
        Instantiates an SMTP connection used to send e-mail messages with.
        +
        +
        Parameters:
        +
        host - The SMTP server address.
        +
        port - The SMTP server port (e.g. 25, 587, 465).
        +
        socketTimeout - The socket connection timeout value in milliseconds.
        +
        useAuthentication - Determines whether authentication is needed for the SMTP server.
        +
        secure - The encryption security layer to use for the SMTP connection ("TLS" or "SSL"). If + left blank, no encryption layer will be used.
        +
        username - If authentication is required, the username to authenticate with.
        +
        password - If authentication is required, the password to authenticate with.
        +
        from - The FROM field to use for dispatched e-mail messages.
        +
        +
      • +
      + + + +
        +
      • +

        SMTPConnection

        +
        public SMTPConnection(String host,
        +                      String port,
        +                      boolean useAuthentication,
        +                      String secure,
        +                      String username,
        +                      String password,
        +                      String from)
        +
        Instantiates an SMTP connection used to send e-mail messages with.
        +
        +
        Parameters:
        +
        host - The SMTP server address.
        +
        port - The SMTP server port (e.g. 25, 587, 465).
        +
        useAuthentication - Determines whether authentication is needed for the SMTP server.
        +
        secure - The encryption security layer to use for the SMTP connection ("TLS" or "SSL"). If + left blank, no encryption layer will be used.
        +
        username - If authentication is required, the username to authenticate with.
        +
        password - If authentication is required, the password to authenticate with.
        +
        from - The FROM field to use for the e-mail.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getHost

        +
        public String getHost()
        +
        Returns the SMTP server address.
        +
        +
        Returns:
        +
        The SMTP server address.
        +
        +
      • +
      + + + +
        +
      • +

        setHost

        +
        public void setHost(String host)
        +
        Sets the SMTP server address.
        +
        +
        Parameters:
        +
        host - The SMTP server address to use.
        +
        +
      • +
      + + + +
        +
      • +

        getPort

        +
        public String getPort()
        +
        Returns the SMTP server port.
        +
        +
        Returns:
        +
        The SMTP server port.
        +
        +
      • +
      + + + +
        +
      • +

        setPort

        +
        public void setPort(String port)
        +
        Sets the SMTP server port.
        +
        +
        Parameters:
        +
        port - The SMTP server port to use (e.g. 25, 587, 465).
        +
        +
      • +
      + + + +
        +
      • +

        isUseAuthentication

        +
        public boolean isUseAuthentication()
        +
        Returns true if authentication is needed for the SMTP server, otherwise returns false.
        +
        +
        Returns:
        +
        true if authentication is needed for the SMTP server, otherwise returns false.
        +
        +
      • +
      + + + +
        +
      • +

        setUseAuthentication

        +
        public void setUseAuthentication(boolean useAuthentication)
        +
        Sets whether authentication is needed for the SMTP server.
        +
        +
        Parameters:
        +
        useAuthentication - Determines whether authentication is needed for the SMTP server.
        +
        +
      • +
      + + + +
        +
      • +

        getSecure

        +
        public String getSecure()
        +
        Returns the encryption security layer being used for the SMTP connection (e.g "TLS" or + "SSL").
        +
        +
        Returns:
        +
        The encryption security layer being used for the SMTP connection (e.g "TLS" or + "SSL").
        +
        +
      • +
      + + + +
        +
      • +

        setSecure

        +
        public void setSecure(String secure)
        +
        Sets the encryption security layer to use for the SMTP connection.
        +
        +
        Parameters:
        +
        secure - The encryption security layer to use for the SMTP connection ("TLS" or "SSL"). If + left blank, no encryption layer will be used.
        +
        +
      • +
      + + + +
        +
      • +

        getUsername

        +
        public String getUsername()
        +
        Returns the username being used to authenticate to the SMTP server.
        +
        +
        Returns:
        +
        The username being used to authenticate to the SMTP server.
        +
        +
      • +
      + + + +
        +
      • +

        setUsername

        +
        public void setUsername(String username)
        +
        Sets the username to use to authenticate to the SMTP server.
        +
        +
        Parameters:
        +
        username - The username to authenticate with.
        +
        +
      • +
      + + + +
        +
      • +

        getPassword

        +
        public String getPassword()
        +
        Returns the password being used to authenticate to the SMTP server.
        +
        +
        Returns:
        +
        The password being used to authenticate to the SMTP server.
        +
        +
      • +
      + + + +
        +
      • +

        setPassword

        +
        public void setPassword(String password)
        +
        Sets the password to use to authenticate to the SMTP server.
        +
        +
        Parameters:
        +
        password - The password to authenticate with.
        +
        +
      • +
      + + + +
        +
      • +

        getFrom

        +
        public String getFrom()
        +
        Returns the FROM field being used for dispatched e-mail messages.
        +
        +
        Returns:
        +
        The FROM field being used for dispatched e-mail messages.
        +
        +
      • +
      + + + +
        +
      • +

        setFrom

        +
        public void setFrom(String from)
        +
        Sets the FROM field to use for dispatched e-mail messages.
        +
        +
        Parameters:
        +
        from - The FROM field to use for dispatched e-mail messages.
        +
        +
      • +
      + + + +
        +
      • +

        getSocketTimeout

        +
        public int getSocketTimeout()
        +
        Returns the socket connection timeout value in milliseconds.
        +
        +
        Returns:
        +
        The socket connection timeout value in milliseconds.
        +
        +
      • +
      + + + +
        +
      • +

        setSocketTimeout

        +
        public void setSocketTimeout(int socketTimeout)
        +
        Sets the socket connection timeout value.
        +
        +
        Parameters:
        +
        socketTimeout - The socket connection timeout value in milliseconds.
        +
        +
      • +
      + + + +
        +
      • +

        send

        +
        public void send(String toList,
        +                 String ccList,
        +                 String from,
        +                 String subject,
        +                 String body,
        +                 String charset)
        +          throws org.apache.commons.mail.EmailException
        +
        Sends an e-mail message.
        +
        +
        Parameters:
        +
        toList - A string representing a list of e-mail addresses to send the message to (separated + by ",").
        +
        ccList - A string representing a list of e-mail addresses to copy the message to (separated + by ",").
        +
        from - The FROM field to use for the e-mail message.
        +
        subject - The subject of the e-mail message.
        +
        body - The content of the e-mail message.
        +
        charset - The charset encoding to use when sending the e-mail message.
        +
        Throws:
        +
        org.apache.commons.mail.EmailException - If an error occurred while sending the e-mail message.
        +
        +
      • +
      + + + +
        +
      • +

        send

        +
        public void send(String toList,
        +                 String ccList,
        +                 String from,
        +                 String subject,
        +                 String body)
        +          throws org.apache.commons.mail.EmailException
        +
        Sends an e-mail message.
        +
        +
        Parameters:
        +
        toList - A string representing a list of e-mail addresses to send the message to (separated + by ",").
        +
        ccList - A string representing a list of e-mail addresses to copy the message to (separated + by ",").
        +
        from - The FROM field to use for the e-mail message.
        +
        subject - The subject of the e-mail message.
        +
        body - The content of the e-mail message.
        +
        Throws:
        +
        org.apache.commons.mail.EmailException - If an error occurred while sending the e-mail message.
        +
        +
      • +
      + + + +
        +
      • +

        send

        +
        public void send(String toList,
        +                 String ccList,
        +                 String subject,
        +                 String body)
        +          throws org.apache.commons.mail.EmailException
        +
        Sends an e-mail message.
        +
        +
        Parameters:
        +
        toList - A string representing a list of e-mail addresses to send the message to (separated + by ",").
        +
        ccList - A string representing a list of e-mail addresses to copy the message to (separated + by ",").
        +
        subject - The subject of the e-mail message.
        +
        body - The content of the e-mail message.
        +
        Throws:
        +
        org.apache.commons.mail.EmailException - If an error occurred while sending the e-mail message.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnectionFactory.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnectionFactory.html new file mode 100644 index 0000000000..b508d5b08b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SMTPConnectionFactory.html @@ -0,0 +1,246 @@ + + + + + +SMTPConnectionFactory + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class SMTPConnectionFactory

+
+
+ +
+
    +
  • +
    +
    +
    public class SMTPConnectionFactory
    +extends Object
    +
    Utility class used to create SMTPConnection object using the server's default SMTP settings.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        createSMTPConnection

        +
        public static SMTPConnection createSMTPConnection()
        +                                           throws com.mirth.connect.client.core.ControllerException
        +
        Creates an create SMTPConnection object using the server's default SMTP settings.
        +
        +
        Returns:
        +
        The instantiated SMTPConnection object.
        +
        Throws:
        +
        com.mirth.connect.client.core.ControllerException - If the SMTP connection could not be created.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SerializerFactory.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SerializerFactory.html new file mode 100644 index 0000000000..7200ae3321 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SerializerFactory.html @@ -0,0 +1,660 @@ + + + + + +SerializerFactory + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class SerializerFactory

+
+
+ +
+
    +
  • +
    +
    +
    public class SerializerFactory
    +extends Object
    +
    Used to create a serializer for a specific data type for conversion to and from XML.
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      All Methods Static Methods Concrete Methods Deprecated Methods 
      Modifier and TypeMethod and Description
      static Map<String,Object>getDefaultDeserializationProperties(String dataType) +
      Returns a map of default properties used to customize how deserialization from XML to the + data type is performed.
      +
      static Map<String,Object>getDefaultSerializationProperties(String dataType) +
      Returns a map of default properties used to customize how serialization from the data type to + XML is performed.
      +
      static com.mirth.connect.model.converters.IMessageSerializergetEDISerializer(String segmentDelim, + String elementDelim, + String subelementDelim) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetHL7Serializer() +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetHL7Serializer(boolean useStrictParser, + boolean useStrictValidation) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetHL7Serializer(boolean useStrictParser, + boolean useStrictValidation, + boolean handleRepetitions) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetHL7Serializer(boolean useStrictParser, + boolean useStrictValidation, + boolean handleRepetitions, + boolean convertLFtoCR) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetHL7Serializer(boolean useStrictParser, + boolean useStrictValidation, + boolean handleRepetitions, + boolean convertLFtoCR, + boolean handleSubcomponents) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetNCPDPSerializer(String segmentDelim, + String groupDelim, + String fieldDelim) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetNCPDPSerializer(String segmentDelim, + String groupDelim, + String fieldDelim, + boolean useStrictValidation) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
      +
      +
      static com.mirth.connect.model.converters.IMessageSerializergetSerializer(String dataType) +
      Returns a serializer (with toXML and fromXML methods) for a given data type.
      +
      static com.mirth.connect.model.converters.IMessageSerializergetSerializer(String dataType, + Map<String,Object> serializationPropertiesMap, + Map<String,Object> deserializationPropertiesMap) +
      Returns a serializer (with toXML and fromXML methods) for a given data type and properties.
      +
      static com.mirth.connect.model.converters.IMessageSerializergetX12Serializer(boolean inferDelimiters) +
      Deprecated.  +
      This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
      +
      +
      + +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getSerializer

        +
        public static com.mirth.connect.model.converters.IMessageSerializer getSerializer(String dataType)
        +
        Returns a serializer (with toXML and fromXML methods) for a given data type. Any + serialization or deserialization properties will be left as the default values.
        +
        +
        Parameters:
        +
        dataType - The plugin point (e.g. "HL7V2") of the data type to create the serializer for.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getSerializer

        +
        public static com.mirth.connect.model.converters.IMessageSerializer getSerializer(String dataType,
        +                                                                                  Map<String,Object> serializationPropertiesMap,
        +                                                                                  Map<String,Object> deserializationPropertiesMap)
        +
        Returns a serializer (with toXML and fromXML methods) for a given data type and properties.
        +
        +
        Parameters:
        +
        dataType - The plugin point (e.g. "HL7V2") of the data type to create the serializer for.
        +
        serializationPropertiesMap - A Map of properties used to customize how serialization from the data type to XML + is performed.
        +
        deserializationPropertiesMap - A Map of properties used to customize how deserialization from XML to the data + type is performed.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getDefaultSerializationProperties

        +
        public static Map<String,Object> getDefaultSerializationProperties(String dataType)
        +
        Returns a map of default properties used to customize how serialization from the data type to + XML is performed.
        +
        +
        Parameters:
        +
        dataType - The plugin point (e.g. "HL7V2") of the data type to get default properties for.
        +
        Returns:
        +
        The map of default serialization properties.
        +
        +
      • +
      + + + +
        +
      • +

        getDefaultDeserializationProperties

        +
        public static Map<String,Object> getDefaultDeserializationProperties(String dataType)
        +
        Returns a map of default properties used to customize how deserialization from XML to the + data type is performed.
        +
        +
        Parameters:
        +
        dataType - The plugin point (e.g. "HL7V2") of the data type to get default properties for.
        +
        Returns:
        +
        The map of default deserialization properties.
        +
        +
      • +
      + + + +
        +
      • +

        getHL7Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getHL7Serializer(boolean useStrictParser,
        +                                                                                                 boolean useStrictValidation,
        +                                                                                                 boolean handleRepetitions,
        +                                                                                                 boolean convertLFtoCR,
        +                                                                                                 boolean handleSubcomponents)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
        +
        Returns an HL7 v2.x serializer.
        +
        +
        Parameters:
        +
        useStrictParser - If true, messages will be parsed based upon strict HL7 specifications.
        +
        useStrictValidation - If true, messages will be validated using HL7 specifications (applies to Strict + Parser only).
        +
        handleRepetitions - If true, field repetitions will be parsed (applies to Non-Strict Parser only).
        +
        convertLFtoCR - If true, line feeds (\n) will be converted to carriage returns (\r) automatically + (applies to Non-Strict Parser only).
        +
        handleSubcomponents - If true, subcomponents will be parsed (applies to Non-Strict Parser only).
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getHL7Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getHL7Serializer(boolean useStrictParser,
        +                                                                                                 boolean useStrictValidation,
        +                                                                                                 boolean handleRepetitions,
        +                                                                                                 boolean convertLFtoCR)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
        +
        Returns an HL7 v2.x serializer.
        +
        +
        Parameters:
        +
        useStrictParser - If true, messages will be parsed based upon strict HL7 specifications.
        +
        useStrictValidation - If true, messages will be validated using HL7 specifications (applies to Strict + Parser only).
        +
        handleRepetitions - If true, field repetitions will be parsed (applies to Non-Strict Parser only).
        +
        convertLFtoCR - If true, line feeds (\n) will be converted to carriage returns (\r) automatically + (applies to Non-Strict Parser only).
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getHL7Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getHL7Serializer(boolean useStrictParser,
        +                                                                                                 boolean useStrictValidation,
        +                                                                                                 boolean handleRepetitions)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
        +
        Returns an HL7 v2.x serializer.
        +
        +
        Parameters:
        +
        useStrictParser - If true, messages will be parsed based upon strict HL7 specifications.
        +
        useStrictValidation - If true, messages will be validated using HL7 specifications (applies to Strict + Parser only).
        +
        handleRepetitions - If true, field repetitions will be parsed (applies to Non-Strict Parser only).
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getHL7Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getHL7Serializer(boolean useStrictParser,
        +                                                                                                 boolean useStrictValidation)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
        +
        Returns an HL7 v2.x serializer.
        +
        +
        Parameters:
        +
        useStrictParser - If true, messages will be parsed based upon strict HL7 specifications.
        +
        useStrictValidation - If true, messages will be validated using HL7 specifications (applies to Strict + Parser only).
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getHL7Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getHL7Serializer()
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
        +
        Returns an HL7 v2.x serializer.
        +
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getX12Serializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getX12Serializer(boolean inferDelimiters)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
        +
        Returns an EDI / X12 serializer.
        +
        +
        Parameters:
        +
        inferDelimiters - This property only applies to X12 messages. If checked, the delimiters are + inferred from the incoming message and the delimiter properties will not be used.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getEDISerializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getEDISerializer(String segmentDelim,
        +                                                                                                 String elementDelim,
        +                                                                                                 String subelementDelim)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
        +
        Returns an EDI / X12 serializer.
        +
        +
        Parameters:
        +
        segmentDelim - Characters that delimit the segments in the message.
        +
        elementDelim - Characters that delimit the elements in the message.
        +
        subelementDelim - Characters that delimit the subelements in the message.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getNCPDPSerializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getNCPDPSerializer(String segmentDelim,
        +                                                                                                   String groupDelim,
        +                                                                                                   String fieldDelim,
        +                                                                                                   boolean useStrictValidation)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
        +
        Returns an NCPDP serializer.
        +
        +
        Parameters:
        +
        segmentDelim - Characters that delimit the segments in the message.
        +
        groupDelim - Characters that delimit the groups in the message.
        +
        fieldDelim - Characters that delimit the fields in the message.
        +
        useStrictValidation - Validates the NCPDP message against a schema.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      + + + +
        +
      • +

        getNCPDPSerializer

        +
        @Deprecated
        +public static com.mirth.connect.model.converters.IMessageSerializer getNCPDPSerializer(String segmentDelim,
        +                                                                                                   String groupDelim,
        +                                                                                                   String fieldDelim)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
        +
        Returns an NCPDP serializer.
        +
        +
        Parameters:
        +
        segmentDelim - Characters that delimit the segments in the message.
        +
        groupDelim - Characters that delimit the groups in the message.
        +
        fieldDelim - Characters that delimit the fields in the message.
        +
        Returns:
        +
        The instantiated IXMLSerializer object.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SourceMap.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SourceMap.html new file mode 100644 index 0000000000..436d81b320 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/SourceMap.html @@ -0,0 +1,534 @@ + + + + + +SourceMap + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class SourceMap

+
+
+ +
+ +
+
+ +
+
+ +
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/UUIDGenerator.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/UUIDGenerator.html new file mode 100644 index 0000000000..1ead266e81 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/UUIDGenerator.html @@ -0,0 +1,244 @@ + + + + + +UUIDGenerator + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class UUIDGenerator

+
+
+ +
+
    +
  • +
    +
    +
    public class UUIDGenerator
    +extends Object
    +
    Utility class to create unique identifiers.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getUUID

        +
        public static String getUUID()
        +
        Returns a type 4 (pseudo randomly generated) UUID. The UUID is generated using a + cryptographically strong pseudo random number generator.
        +
        +
        Returns:
        +
        The UUID string.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/VMRouter.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/VMRouter.html new file mode 100644 index 0000000000..e7955b4949 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/VMRouter.html @@ -0,0 +1,372 @@ + + + + + +VMRouter + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.server.userutil
+

Class VMRouter

+
+
+ +
+
    +
  • +
    +
    +
    public class VMRouter
    +extends Object
    +
    Utility class used to dispatch messages to channels.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        VMRouter

        +
        public VMRouter()
        +
        Instantiates a VMRouter object.
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        routeMessage

        +
        public Response routeMessage(String channelName,
        +                             String message)
        +
        Dispatches a message to a channel, specified by the deployed channel name. If the dispatch + fails for any reason (for example, if the target channel is not started), a Response object + with the ERROR status and the error message will be returned.
        +
        +
        Parameters:
        +
        channelName - The name of the deployed channel to dispatch the message to.
        +
        message - The message to dispatch to the channel.
        +
        Returns:
        +
        The Response object returned by the channel, if its source connector is configured to + return one.
        +
        +
      • +
      + + + +
        +
      • +

        routeMessage

        +
        public Response routeMessage(String channelName,
        +                             RawMessage rawMessage)
        +
        Dispatches a message to a channel, specified by the deployed channel name. If the dispatch + fails for any reason (for example, if the target channel is not started), a Response object + with the ERROR status and the error message will be returned.
        +
        +
        Parameters:
        +
        channelName - The name of the deployed channel to dispatch the message to.
        +
        rawMessage - A RawMessage object to dispatch to the channel.
        +
        Returns:
        +
        The Response object returned by the channel, if its source connector is configured to + return one.
        +
        +
      • +
      + + + +
        +
      • +

        routeMessageByChannelId

        +
        public Response routeMessageByChannelId(String channelId,
        +                                        String message)
        +
        Dispatches a message to a channel, specified by the deployed channel ID. If the dispatch + fails for any reason (for example, if the target channel is not started), a Response object + with the ERROR status and the error message will be returned.
        +
        +
        Parameters:
        +
        channelId - The ID of the deployed channel to dispatch the message to.
        +
        message - The message to dispatch to the channel.
        +
        Returns:
        +
        The Response object returned by the channel, if its source connector is configured to + return one.
        +
        +
      • +
      + + + +
        +
      • +

        routeMessageByChannelId

        +
        public Response routeMessageByChannelId(String channelId,
        +                                        RawMessage rawMessage)
        +
        Dispatches a message to a channel, specified by the deployed channel ID. If the dispatch + fails for any reason (for example, if the target channel is not started), a Response object + with the ERROR status and the error message will be returned.
        +
        +
        Parameters:
        +
        channelId - The ID of the deployed channel to dispatch the message to.
        +
        rawMessage - A RawMessage object to dispatch to the channel.
        +
        Returns:
        +
        The Response object returned by the channel, if its source connector is configured to + return one.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-frame.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-frame.html new file mode 100644 index 0000000000..97ea120f2b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-frame.html @@ -0,0 +1,52 @@ + + + + + +com.mirth.connect.server.userutil + + + + + +

com.mirth.connect.server.userutil

+
+

Classes

+ +

Enums

+ +
+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-summary.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-summary.html new file mode 100644 index 0000000000..31e5839843 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-summary.html @@ -0,0 +1,346 @@ + + + + + +com.mirth.connect.server.userutil + + + + + + + + +
+ + + + + + + +
+ + +
+

Package com.mirth.connect.server.userutil

+
+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+

See: Description

+
+
+ + + + +

Package com.mirth.connect.server.userutil Description

+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-tree.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-tree.html new file mode 100644 index 0000000000..ede8f149f5 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/server/userutil/package-tree.html @@ -0,0 +1,175 @@ + + + + + +com.mirth.connect.server.userutil Class Hierarchy + + + + + + + + +
+ + + + + + + +
+ + +
+

Hierarchy For Package com.mirth.connect.server.userutil

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +

Enum Hierarchy

+ +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/AttachmentEntry.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/AttachmentEntry.html new file mode 100644 index 0000000000..d297212ccf --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/AttachmentEntry.html @@ -0,0 +1,454 @@ + + + + + +AttachmentEntry + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class AttachmentEntry

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Serializable
    +
    +
    +
    +
    public class AttachmentEntry
    +extends Object
    +implements Serializable
    +
    Used to store and retrieve details about message attachments such as the name, contents, and + MIME type. When using a variable to specify attachments, such as in an SMTP Sender or + Web Service Sender, the variable must reference a list of AttachmentEntry objects.
    +
    +
    See Also:
    +
    Serialized Form
    +
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        AttachmentEntry

        +
        public AttachmentEntry()
        +
        Instantiates a new AttachmentEntry with no name, content, or MIME type.
        +
      • +
      + + + +
        +
      • +

        AttachmentEntry

        +
        public AttachmentEntry(AttachmentEntry attachment)
        +
        Instantiates a new AttachmentEntry that copies the name, content, and MIME type + from a given AttachmentEntry object.
        +
        +
        Parameters:
        +
        attachment - The AttachmentEntry object to copy.
        +
        +
      • +
      + + + +
        +
      • +

        AttachmentEntry

        +
        public AttachmentEntry(String name,
        +                       String content,
        +                       String mimeType)
        +
        Instantiates a new AttachmentEntry with a name, content, and a MIME type.
        +
        +
        Parameters:
        +
        name - The name of the attachment entry.
        +
        content - The content to store for the attachment entry.
        +
        mimeType - The MIME type of the attachment entry.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getName

        +
        public String getName()
        +
        Returns the name of the attachment entry.
        +
        +
        Returns:
        +
        The name of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        setName

        +
        public void setName(String name)
        +
        Sets the name of the attachment entry.
        +
        +
        Parameters:
        +
        name - The name of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        getContent

        +
        public String getContent()
        +
        Returns the content of the attachment entry.
        +
        +
        Returns:
        +
        The content of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        setContent

        +
        public void setContent(String content)
        +
        Sets the content of the attachment entry.
        +
        +
        Parameters:
        +
        content - The content of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        getMimeType

        +
        public String getMimeType()
        +
        Returns the MIME type of the attachment entry.
        +
        +
        Returns:
        +
        The MIME type of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        setMimeType

        +
        public void setMimeType(String mimeType)
        +
        Sets the MIME type of the attachment entry.
        +
        +
        Parameters:
        +
        mimeType - The MIME type of the attachment entry.
        +
        +
      • +
      + + + +
        +
      • +

        equals

        +
        public boolean equals(Object obj)
        +
        +
        Overrides:
        +
        equals in class Object
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ContentType.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ContentType.html new file mode 100644 index 0000000000..0ca99619e6 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ContentType.html @@ -0,0 +1,517 @@ + + + + + +ContentType + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Enum ContentType

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Serializable, Comparable<ContentType>
    +
    +
    +
    +
    public enum ContentType
    +extends Enum<ContentType>
    +
    Denotes various types of content created by a channel. Available types are: + + RAW, PROCESSED_RAW, TRANSFORMED, ENCODED, SENT, RESPONSE, RESPONSE_TRANSFORMED, + PROCESSED_RESPONSE, CONNECTOR_MAP, CHANNEL_MAP, RESPONSE_MAP, PROCESSING_ERROR, + POSTPROCESSOR_ERROR, RESPONSE_ERROR, SOURCE_MAP
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Enum Constant Detail

      + + + + + + + +
        +
      • +

        PROCESSED_RAW

        +
        public static final ContentType PROCESSED_RAW
        +
      • +
      + + + +
        +
      • +

        TRANSFORMED

        +
        public static final ContentType TRANSFORMED
        +
      • +
      + + + +
        +
      • +

        ENCODED

        +
        public static final ContentType ENCODED
        +
      • +
      + + + + + + + +
        +
      • +

        RESPONSE

        +
        public static final ContentType RESPONSE
        +
      • +
      + + + +
        +
      • +

        RESPONSE_TRANSFORMED

        +
        public static final ContentType RESPONSE_TRANSFORMED
        +
      • +
      + + + +
        +
      • +

        PROCESSED_RESPONSE

        +
        public static final ContentType PROCESSED_RESPONSE
        +
      • +
      + + + +
        +
      • +

        CONNECTOR_MAP

        +
        public static final ContentType CONNECTOR_MAP
        +
      • +
      + + + +
        +
      • +

        CHANNEL_MAP

        +
        public static final ContentType CHANNEL_MAP
        +
      • +
      + + + +
        +
      • +

        RESPONSE_MAP

        +
        public static final ContentType RESPONSE_MAP
        +
      • +
      + + + +
        +
      • +

        PROCESSING_ERROR

        +
        public static final ContentType PROCESSING_ERROR
        +
      • +
      + + + +
        +
      • +

        POSTPROCESSOR_ERROR

        +
        public static final ContentType POSTPROCESSOR_ERROR
        +
      • +
      + + + +
        +
      • +

        RESPONSE_ERROR

        +
        public static final ContentType RESPONSE_ERROR
        +
      • +
      + + + +
        +
      • +

        SOURCE_MAP

        +
        public static final ContentType SOURCE_MAP
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        values

        +
        public static ContentType[] values()
        +
        Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
        +for (ContentType c : ContentType.values())
        +    System.out.println(c);
        +
        +
        +
        Returns:
        +
        an array containing the constants of this enum type, in the order they are declared
        +
        +
      • +
      + + + +
        +
      • +

        valueOf

        +
        public static ContentType valueOf(String name)
        +
        Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
        +
        +
        Parameters:
        +
        name - the name of the enum constant to be returned.
        +
        Returns:
        +
        the enum constant with the specified name
        +
        Throws:
        +
        IllegalArgumentException - if this enum type has no constant with the specified name
        +
        NullPointerException - if the argument is null
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableAttachment.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableAttachment.html new file mode 100644 index 0000000000..bbd3570c8d --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableAttachment.html @@ -0,0 +1,367 @@ + + + + + +ImmutableAttachment + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ImmutableAttachment

+
+
+ +
+
    +
  • +
    +
    +
    public class ImmutableAttachment
    +extends Object
    +
    This class represents an message attachment and is used to retrieve details such as the + replacement token or content type.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ImmutableAttachment

        +
        public ImmutableAttachment(com.mirth.connect.donkey.model.message.attachment.Attachment attachment)
        +
        Instantiates a new ImmutableAttachment object.
        +
        +
        Parameters:
        +
        attachment - The Attachment object that this object will reference for retrieving data.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getAttachmentId

        +
        public String getAttachmentId()
        +
        Returns the unique replacement token for the attachment. This token should replace the + attachment content in the message string, and will be used to re-attach the attachment + content in the outbound message before it is sent to a downstream system.
        +
        +
        Returns:
        +
        The unique replacement token for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        getId

        +
        public String getId()
        +
        Returns the unique ID for the attachment.
        +
        +
        Returns:
        +
        The unique ID for the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        getContent

        +
        public byte[] getContent()
        +
        Returns the content of the attachment as a byte array.
        +
        +
        Returns:
        +
        The content of the attachment as a byte array.
        +
        +
      • +
      + + + +
        +
      • +

        getType

        +
        public String getType()
        +
        Returns the MIME type of the attachment.
        +
        +
        Returns:
        +
        The MIME type of the attachment.
        +
        +
      • +
      + + + +
        +
      • +

        isEncrypted

        +
        public boolean isEncrypted()
        +
        Returns a boolean indicating whether the attachment content is encrypted.
        +
        +
        Returns:
        +
        A boolean indicating whether the attachment content is encrypted.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableConnectorMessage.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableConnectorMessage.html new file mode 100644 index 0000000000..33a18184ec --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableConnectorMessage.html @@ -0,0 +1,1091 @@ + + + + + +ImmutableConnectorMessage + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ImmutableConnectorMessage

+
+
+ +
+
    +
  • +
    +
    +
    public class ImmutableConnectorMessage
    +extends Object
    +
    This class represents a connector message and is used to retrieve details such as the message ID, + metadata ID, status, and various content types.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ImmutableConnectorMessage

        +
        public ImmutableConnectorMessage(com.mirth.connect.donkey.model.message.ConnectorMessage connectorMessage)
        +
        Instantiates a new ImmutableConnectorMessage object.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message that this object will reference for retrieving data.
        +
        +
      • +
      + + + +
        +
      • +

        ImmutableConnectorMessage

        +
        public ImmutableConnectorMessage(com.mirth.connect.donkey.model.message.ConnectorMessage connectorMessage,
        +                                 boolean modifiableMaps)
        +
        Instantiates a new ImmutableConnectorMessage object.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message that this object will reference for retrieving data.
        +
        modifiableMaps - If true, variable maps (e.g. connector/channel/response) will be modifiable, and + values may be set in them as well as retrieved. Otherwise, data will only be able + to be retrieved from the maps, and no updates will be allowed.
        +
        +
      • +
      + + + +
        +
      • +

        ImmutableConnectorMessage

        +
        public ImmutableConnectorMessage(com.mirth.connect.donkey.model.message.ConnectorMessage connectorMessage,
        +                                 boolean modifiableMaps,
        +                                 Map<String,Integer> destinationIdMap)
        +
        Instantiates a new ImmutableConnectorMessage object.
        +
        +
        Parameters:
        +
        connectorMessage - The connector message that this object will reference for retrieving data.
        +
        modifiableMaps - If true, variable maps (e.g. connector/channel/response) will be modifiable, and + values may be set in them as well as retrieved. Otherwise, data will only be able + to be retrieved from the maps, and no updates will be allowed.
        +
        destinationIdMap - A map containing all applicable destination names in the channel and their + corresponding connector metadata ids.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getMetaDataId

        +
        public int getMetaDataId()
        +
        Returns the metadata ID of this connector message. Note that the source connector has a + metadata ID of 0.
        +
        +
        Returns:
        +
        The metadata ID of this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelId

        +
        public String getChannelId()
        +
        Returns the ID of the channel associated with this connector message.
        +
        +
        Returns:
        +
        The ID of the channel associated with this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelName

        +
        public String getChannelName()
        +
        Returns the Name of the channel associated with this connector message.
        +
        +
        Returns:
        +
        The Name of the channel associated with this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getConnectorName

        +
        public String getConnectorName()
        +
        Returns the name of the connector associated with this connector message.
        +
        +
        Returns:
        +
        The name of the connector associated with this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getServerId

        +
        public String getServerId()
        +
        Returns the ID of the server associated with this connector message.
        +
        +
        Returns:
        +
        The ID of the server associated with this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getReceivedDate

        +
        public Calendar getReceivedDate()
        +
        Returns the date/time that this connector message was created by the channel.
        +
        +
        Returns:
        +
        The date/time that this connector message was created by the channel.
        +
        +
      • +
      + + + +
        +
      • +

        getSendAttempts

        +
        public int getSendAttempts()
        +
        Returns the number of times this message has been attempted to be dispatched by the + connector.
        +
        +
        Returns:
        +
        The number of times this message has been attempted to be dispatched by the + connector.
        +
        +
      • +
      + + + +
        +
      • +

        getSendDate

        +
        public Calendar getSendDate()
        +
        Returns the date/time immediately before this connector message's most recent send attempt. + Only valid for destination connectors in the response transformer or postprocessor. Returns + null otherwise.
        +
        +
        Returns:
        +
        The date/time immediately before this connector message's most recent send attempt.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseDate

        +
        public Calendar getResponseDate()
        +
        Returns the date/time immediately after this connector message's response is received. Only + valid for destination connectors in the response transformer or postprocessor. Returns null + otherwise.
        +
        +
        Returns:
        +
        The date/time immediately after this connector message's response is received.
        +
        +
      • +
      + + + +
        +
      • +

        getStatus

        +
        public Status getStatus()
        +
        Returns the status (e.g. SENT) of this connector message.
        +
        +
        Returns:
        +
        The status (e.g. SENT) of this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageContent

        +
        public ImmutableMessageContent getMessageContent(ContentType contentType)
        +
        Retrieves content associated with this connector message.
        +
        +
        Parameters:
        +
        contentType - The ContentType (e.g. RAW, ENCODED) of the content to retrieve.
        +
        Returns:
        +
        The content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getContent

        +
        @Deprecated
        +public ImmutableMessageContent getContent(ContentType contentType)
        +
        Deprecated. The getContent(contentType) method has been deprecated and will soon be removed. + Please use getMessageContent(contentType) instead.
        +
        Retrieves content associated with this connector message.
        +
        +
        Parameters:
        +
        contentType - The ContentType (e.g. RAW, ENCODED) of the content to retrieve.
        +
        Returns:
        +
        The content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getRaw

        +
        public ImmutableMessageContent getRaw()
        +
        Retrieves raw content associated with this connector message.
        +
        +
        Returns:
        +
        The raw content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getRawData

        +
        public String getRawData()
        +
        Retrieves raw content associated with this connector message.
        +
        +
        Returns:
        +
        The raw content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getProcessedRaw

        +
        public ImmutableMessageContent getProcessedRaw()
        +
        Retrieves processed raw content associated with this connector message.
        +
        +
        Returns:
        +
        The processed raw content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getProcessedRawData

        +
        public String getProcessedRawData()
        +
        Retrieves processed raw content associated with this connector message.
        +
        +
        Returns:
        +
        The processed raw content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getTransformed

        +
        public ImmutableMessageContent getTransformed()
        +
        Retrieves transformed content associated with this connector message.
        +
        +
        Returns:
        +
        The transformed content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getTransformedData

        +
        public String getTransformedData()
        +
        Retrieves transformed content associated with this connector message.
        +
        +
        Returns:
        +
        The transformed content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getEncoded

        +
        public ImmutableMessageContent getEncoded()
        +
        Retrieves encoded content associated with this connector message.
        +
        +
        Returns:
        +
        The encoded content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getEncodedData

        +
        public String getEncodedData()
        +
        Retrieves encoded content associated with this connector message.
        +
        +
        Returns:
        +
        The encoded content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getResponse

        +
        public ImmutableMessageContent getResponse()
        +
        Retrieves response content associated with this connector message.
        +
        +
        Returns:
        +
        The response content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseData

        +
        public Response getResponseData()
        +
        Retrieves response content associated with this connector message.
        +
        +
        Returns:
        +
        The response content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseTransformed

        +
        public ImmutableMessageContent getResponseTransformed()
        +
        Retrieves transformed response content associated with this connector message.
        +
        +
        Returns:
        +
        The transformed response content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseTransformedData

        +
        public String getResponseTransformedData()
        +
        Retrieves transformed response content associated with this connector message.
        +
        +
        Returns:
        +
        The transformed response content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getProcessedResponse

        +
        public ImmutableMessageContent getProcessedResponse()
        +
        Retrieves processed response content associated with this connector message.
        +
        +
        Returns:
        +
        The processed response content, as an ImmutableMessageContent object.
        +
        +
      • +
      + + + +
        +
      • +

        getProcessedResponseData

        +
        public Response getProcessedResponseData()
        +
        Retrieves processed response content associated with this connector message.
        +
        +
        Returns:
        +
        The processed response content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageId

        +
        public long getMessageId()
        +
        Returns the sequential ID of the overall Message associated with this connector message.
        +
        +
        Returns:
        +
        The sequential ID of the overall Message associated with this connector message.
        +
        +
      • +
      + + + +
        +
      • +

        getSourceMap

        +
        public Map<String,Object> getSourceMap()
        +
        Returns the source map. This map is unmodifiable and only data retrieval will be allowed.
        +
        +
        Returns:
        +
        The source map.
        +
        +
      • +
      + + + +
        +
      • +

        getConnectorMap

        +
        public Map<String,Object> getConnectorMap()
        +
        Returns the connector map. If this connector message was instantiated with a 'true' value for + modifiableMaps, then this map will allow both data retrieval and updates. Otherwise, the map + will be unmodifiable and only data retrieval will be allowed.
        +
        +
        Returns:
        +
        The connector map.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelMap

        +
        public Map<String,Object> getChannelMap()
        +
        Returns the channel map. If this connector message was instantiated with a 'true' value for + modifiableMaps, then this map will allow both data retrieval and updates. Otherwise, the map + will be unmodifiable and only data retrieval will be allowed.
        +
        +
        Returns:
        +
        The channel map.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseMap

        +
        public Map<String,Object> getResponseMap()
        +
        Returns the response map. If this connector message was instantiated with a 'true' value for + modifiableMaps, then this map will allow both data retrieval and updates. Otherwise, the map + will be unmodifiable and only data retrieval will be allowed. In addition, if this connector + message was instantiated with the destinationNameMap parameter, the map will check + destination names as well as the proper "d#" keys when retrieving data.
        +
        +
        Returns:
        +
        The response map.
        +
        +
      • +
      + + + +
        +
      • +

        getPostProcessorError

        +
        public String getPostProcessorError()
        +
        Returns the postprocessing error string associated with this connector message, if it exists.
        +
        +
        Returns:
        +
        The postprocessing error string associated with this connector message, if it exists.
        +
        +
      • +
      + + + +
        +
      • +

        getProcessingError

        +
        public String getProcessingError()
        +
        Returns the processing error string associated with this connector message, if it exists.
        +
        +
        Returns:
        +
        The processing error string associated with this connector message, if it exists.
        +
        +
      • +
      + + + +
        +
      • +

        getResponseError

        +
        public String getResponseError()
        +
        Returns the response error string associated with this connector message, if it exists.
        +
        +
        Returns:
        +
        The response error string associated with this connector message, if it exists.
        +
        +
      • +
      + + + +
        +
      • +

        getDestinationNameMap

        +
        @Deprecated
        +public Map<String,String> getDestinationNameMap()
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getDestinationIdMap() instead.
        +
        Returns a Map of destination connector names linked to their corresponding "d#" response map + keys (where "#" is the destination connector metadata ID).
        +
        +
        Returns:
        +
        A Map of destination connector names linked to their corresponding "d#" response map + keys.
        +
        +
      • +
      + + + +
        +
      • +

        getDestinationIdMap

        +
        public Map<String,Integer> getDestinationIdMap()
        +
        Returns a Map of destination connector names linked to their corresponding connector metadata + ID.
        +
        +
        Returns:
        +
        A Map of destination connector names linked to their corresponding connector metadata + ID.
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessage.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessage.html new file mode 100644 index 0000000000..e8b5e29497 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessage.html @@ -0,0 +1,569 @@ + + + + + +ImmutableMessage + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ImmutableMessage

+
+
+ +
+
    +
  • +
    +
    +
    public class ImmutableMessage
    +extends Object
    +
    This class represents an overall message and is used to retrieve details such as the message ID, + specific connector messages, or the merged connector message.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ImmutableMessage

        +
        public ImmutableMessage(com.mirth.connect.donkey.model.message.Message message)
        +
        Instantiates a new ImmutableMessage object.
        +
        +
        Parameters:
        +
        message - The Message object that this object will reference for retrieving data.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getMessageId

        +
        public Long getMessageId()
        +
        Returns the sequential ID of this message, as a Long.
        +
        +
        Returns:
        +
        The sequential ID of this message, as a Long.
        +
        +
      • +
      + + + +
        +
      • +

        getServerId

        +
        public String getServerId()
        +
        Returns the ID of the server associated with this message.
        +
        +
        Returns:
        +
        The ID of the server associated with this message.
        +
        +
      • +
      + + + +
        +
      • +

        getChannelId

        +
        public String getChannelId()
        +
        Returns the ID of the channel associated with this message.
        +
        +
        Returns:
        +
        The ID of the channel associated with this message.
        +
        +
      • +
      + + + +
        +
      • +

        getReceivedDate

        +
        @Deprecated
        +public Calendar getReceivedDate()
        +
        Deprecated. This method is deprecated and will soon be removed. This method currently returns + the received date of the source connector message.
        +
        Returns the original date/time that this message was created by the channel. If the message + is reprocessed at a later point, this date will remain the same and instead the connector + message received dates will be updated.
        +
        +
        Returns:
        +
        The original date/time that this message was created by the channel.
        +
        +
      • +
      + + + +
        +
      • +

        isProcessed

        +
        public boolean isProcessed()
        +
        Returns whether this message has finished processing through a channel. A message is + considered "processed" if it correctly flows through each applicable connector and the + postprocessor script finishes. Even if a non-fatal error occurs on a particular connector + message and the status ends up as ERROR, or if a message is queued by a destination and has + not yet been sent to the outbound system, it can still be considered processed.
        +
        +
        Returns:
        +
        A boolean indicating whether this message has finished processing through a channel.
        +
        +
      • +
      + + + +
        +
      • +

        getOriginalId

        +
        public Long getOriginalId()
        +
        Returns the ID of the original message this one was reprocessed from.
        +
        +
        Returns:
        +
        The ID of the original message this one was reprocessed from.
        +
        +
      • +
      + + + +
        +
      • +

        getImportId

        +
        public Long getImportId()
        +
        Returns the ID of the original message this one was imported from.
        +
        +
        Returns:
        +
        The ID of the original message this one was imported from.
        +
        +
      • +
      + + + +
        +
      • +

        getImportChannelId

        +
        public String getImportChannelId()
        +
        Returns the ID of the original channel this message was reprocessed from.
        +
        +
        Returns:
        +
        The ID of the original channel this message was reprocessed from.
        +
        +
      • +
      + + + +
        +
      • +

        getAttachments

        +
        public List<ImmutableAttachment> getAttachments()
        +
        Returns a list of attachments associated with this message. This will only be populated in + certain cases, such as when a message is being exported or archived.
        +
        +
        Returns:
        +
        A list of attachments associated with this message.
        +
        +
      • +
      + + + +
        +
      • +

        getConnectorMessages

        +
        public Map<Integer,ImmutableConnectorMessage> getConnectorMessages()
        +
        Returns a map of connector messages associated with this message. The keys are the metadata + IDs (as Integer objects), and the values are the connector messages themselves.
        +
        +
        Returns:
        +
        A map of connector messages associated with this message.
        +
        +
      • +
      + + + +
        +
      • +

        getMergedConnectorMessage

        +
        public ImmutableConnectorMessage getMergedConnectorMessage()
        +
        Returns a "merged" connector message containing data from all connector messages combined. + The raw and processed raw content is copied from the source connector, while values in the + channel and response maps are copied from all connectors.
        +
        +
        Returns:
        +
        A "merged" connector message containing data from all connector messages combined.
        +
        +
      • +
      + + + +
        +
      • +

        getDestinationNameMap

        +
        @Deprecated
        +public Map<String,String> getDestinationNameMap()
        +
        Deprecated. This method is deprecated and will soon be removed. Please use + getDestinationIdMap() instead.
        +
        Returns a Map of destination connector names linked to their corresponding "d#" response map + keys (where "#" is the destination connector metadata ID).
        +
        +
        Returns:
        +
        A Map of destination connector names linked to their corresponding "d#" response map + keys.
        +
        +
      • +
      + + + +
        +
      • +

        getDestinationIdMap

        +
        public Map<String,Integer> getDestinationIdMap()
        +
        Returns a Map of destination connector names linked to their corresponding connector metadata + ID.
        +
        +
        Returns:
        +
        A Map of destination connector names linked to their corresponding connector metadata + ID.
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessageContent.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessageContent.html new file mode 100644 index 0000000000..a363a89e22 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ImmutableMessageContent.html @@ -0,0 +1,365 @@ + + + + + +ImmutableMessageContent + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ImmutableMessageContent

+
+
+ +
+
    +
  • +
    +
    +
    public class ImmutableMessageContent
    +extends Object
    +
    This class represents content associated with a connector message.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        ImmutableMessageContent

        +
        public ImmutableMessageContent(com.mirth.connect.donkey.model.message.MessageContent messageContent)
        +
        Instantiates a new ImmutableMessageContent object.
        +
        +
        Parameters:
        +
        messageContent - The MessageContent object that this object will reference for retrieving data.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getContentType

        +
        public ContentType getContentType()
        +
        Returns the ContentType of this message content (e.g. RAW, ENCODED).
        +
        +
        Returns:
        +
        The ContentType of this message content (e.g. RAW, ENCODED).
        +
        +
      • +
      + + + +
        +
      • +

        getContent

        +
        public String getContent()
        +
        Returns the actual content, as a string.
        +
        +
        Returns:
        +
        The actual content, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        getMessageId

        +
        public long getMessageId()
        +
        Returns the sequential ID of the overall Message associated with this message content.
        +
        +
        Returns:
        +
        The sequential ID of the overall Message associated with this message content.
        +
        +
      • +
      + + + +
        +
      • +

        getMetaDataId

        +
        public int getMetaDataId()
        +
        Returns the metadata ID of the connector associated with this message content. Note that the + source connector has a metadata ID of 0.
        +
        +
        Returns:
        +
        The metadata ID of the connector associated with this message content.
        +
        +
      • +
      + + + +
        +
      • +

        getDataType

        +
        public String getDataType()
        +
        Returns the data type (e.g. "HL7V2") of this message content.
        +
        +
        Returns:
        +
        The data type (e.g. "HL7V2") of this message content.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/JsonUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/JsonUtil.html new file mode 100644 index 0000000000..948d51d98f --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/JsonUtil.html @@ -0,0 +1,325 @@ + + + + + +JsonUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class JsonUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class JsonUtil
    +extends Object
    +
    Provides JSON utility methods.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        prettyPrint

        +
        public static String prettyPrint(String input)
        +
        Formats an JSON string with indented markup.
        +
        +
        Parameters:
        +
        input - The JSON string to format.
        +
        Returns:
        +
        The formatted JSON string.
        +
        +
      • +
      + + + +
        +
      • +

        escape

        +
        public static String escape(String input)
        +
        Escapes any special JSON characters in the input.
        +
        +
        Parameters:
        +
        input - The string to escape.
        +
        Returns:
        +
        The escaped string.
        +
        +
      • +
      + + + +
        +
      • +

        toXml

        +
        public static String toXml(String jsonString)
        +                    throws Exception
        +
        Converts a JSON string to XML. This is the same as calling toXml(String jsonString, boolean + multiplePI, boolean prettyPrint) with multiplePI = false and prettyPrint = false
        +
        +
        Parameters:
        +
        jsonString - The JSON string to convert.
        +
        Returns:
        +
        The converted XML string.
        +
        Throws:
        +
        Exception - If the conversion failed.
        +
        +
      • +
      + + + +
        +
      • +

        toXml

        +
        public static String toXml(String jsonString,
        +                           boolean multiplePI,
        +                           boolean prettyPrint)
        +                    throws Exception
        +
        Converts a JSON string to XML.
        +
        +
        Parameters:
        +
        jsonString - The JSON string to convert.
        +
        multiplePI - If true, the <? xml-multiple ... ?> processing instruction will + be included for arrays.
        +
        prettyPrint - Whether or not to fully indent the XML output.
        +
        Returns:
        +
        The converted XML string.
        +
        Throws:
        +
        Exception - If the conversion failed.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ListBuilder.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ListBuilder.html new file mode 100644 index 0000000000..2631ab39e3 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ListBuilder.html @@ -0,0 +1,757 @@ + + + + + +ListBuilder + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ListBuilder

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Iterable, Collection, List
    +
    +
    +
    +
    public class ListBuilder
    +extends Object
    +implements List
    +
    Convenience class to allow fluent building of lists.
    +
  • +
+
+
+ +
+
+ +
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Lists.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Lists.html new file mode 100644 index 0000000000..a16851e5f9 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Lists.html @@ -0,0 +1,321 @@ + + + + + +Lists + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class Lists

+
+
+ +
+
    +
  • +
    +
    +
    public class Lists
    +extends Object
    +
    Convenience class to allow fluent building of lists.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Lists

        +
        public Lists()
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + + + + + +
        +
      • +

        list

        +
        public static ListBuilder list(Object e)
        +
        Instantiates a new ListBuilder using an ArrayList and the given element.
        +
        +
        Parameters:
        +
        e - element to be appended to this list
        +
        Returns:
        +
        The new ListBuilder instance.
        +
        +
      • +
      + + + +
        +
      • +

        list

        +
        public static ListBuilder list(List list)
        +
        Instantiates a new ListBuilder using the given list.
        +
        +
        Parameters:
        +
        list - The delegate List to use.
        +
        Returns:
        +
        The new ListBuilder instance.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MapBuilder.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MapBuilder.html new file mode 100644 index 0000000000..6f0a8014b0 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MapBuilder.html @@ -0,0 +1,536 @@ + + + + + +MapBuilder + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class MapBuilder

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Map
    +
    +
    +
    +
    public class MapBuilder
    +extends Object
    +implements Map
    +
    Convenience class to allow fluent building of maps.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        add

        +
        public MapBuilder add(Object key,
        +                      Object value)
        +
        Adds an entry to the map using the put(java.lang.Object, java.lang.Object) method, and returns this builder.
        +
        +
        Parameters:
        +
        key - key with which the specified value is to be associated
        +
        value - value to be associated with the specified key
        +
        Returns:
        +
        This MapBuilder instance.
        +
        +
      • +
      + + + +
        +
      • +

        size

        +
        public int size()
        +
        +
        Specified by:
        +
        size in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        isEmpty

        +
        public boolean isEmpty()
        +
        +
        Specified by:
        +
        isEmpty in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        containsKey

        +
        public boolean containsKey(Object key)
        +
        +
        Specified by:
        +
        containsKey in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        containsValue

        +
        public boolean containsValue(Object value)
        +
        +
        Specified by:
        +
        containsValue in interface Map
        +
        +
      • +
      + + + + + + + + + + + + + + + +
        +
      • +

        putAll

        +
        public void putAll(Map m)
        +
        +
        Specified by:
        +
        putAll in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        clear

        +
        public void clear()
        +
        +
        Specified by:
        +
        clear in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        keySet

        +
        public Set<?> keySet()
        +
        +
        Specified by:
        +
        keySet in interface Map
        +
        +
      • +
      + + + + + + + +
        +
      • +

        entrySet

        +
        public Set<?> entrySet()
        +
        +
        Specified by:
        +
        entrySet in interface Map
        +
        +
      • +
      + + + +
        +
      • +

        equals

        +
        public boolean equals(Object obj)
        +
        +
        Specified by:
        +
        equals in interface Map
        +
        Overrides:
        +
        equals in class Object
        +
        +
      • +
      + + + +
        +
      • +

        hashCode

        +
        public int hashCode()
        +
        +
        Specified by:
        +
        hashCode in interface Map
        +
        Overrides:
        +
        hashCode in class Object
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Maps.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Maps.html new file mode 100644 index 0000000000..0910a9c8a5 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Maps.html @@ -0,0 +1,324 @@ + + + + + +Maps + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class Maps

+
+
+ +
+
    +
  • +
    +
    +
    public class Maps
    +extends Object
    +
    Convenience class to allow fluent building of maps.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Maps

        +
        public Maps()
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + + + + + +
        +
      • +

        map

        +
        public static MapBuilder map(Object key,
        +                             Object value)
        +
        Instantiates a new MapBuilder using a HashMap and the given key/value entry.
        +
        +
        Parameters:
        +
        key - key with which the specified value is to be associated
        +
        value - value to be associated with the specified key
        +
        Returns:
        +
        The new MapBuilder instance.
        +
        +
      • +
      + + + +
        +
      • +

        map

        +
        public static MapBuilder map(Map map)
        +
        Instantiates a new MapBuilder using the given map.
        +
        +
        Parameters:
        +
        map - The delegate map to use.
        +
        Returns:
        +
        The new MapBuilder instance.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageHeaders.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageHeaders.html new file mode 100644 index 0000000000..14b2c29350 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageHeaders.html @@ -0,0 +1,387 @@ + + + + + +MessageHeaders + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class MessageHeaders

+
+
+ +
+
    +
  • +
    +
    +
    public class MessageHeaders
    +extends Object
    +
  • +
+
+
+ +
+
+
    +
  • + + + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        get

        +
        @Deprecated
        +public String get(String key)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use getHeader(key) or + getHeaderList(key) instead.
        +
        Get the first header value for the given key.
        +
        +
        Parameters:
        +
        key - The name of the header key.
        +
        Returns:
        +
        The associated value or null if no value exists.
        +
        +
      • +
      + + + +
        +
      • +

        getHeader

        +
        public String getHeader(String key)
        +
        Get the first header value for the given key.
        +
        +
        Parameters:
        +
        key - The name of the header key.
        +
        Returns:
        +
        The associated value or null if no value exists.
        +
        +
      • +
      + + + +
        +
      • +

        getHeaderList

        +
        public List<String> getHeaderList(String key)
        +
        Get all header values for the given key.
        +
        +
        Parameters:
        +
        key - The name of header key.
        +
        Returns:
        +
        A list of all header values for the given key or null if no values exist.
        +
        +
      • +
      + + + +
        +
      • +

        getKeys

        +
        public Set<String> getKeys()
        +
        Get all header keys.
        +
        +
        Returns:
        +
        A set of all header keys.
        +
        +
      • +
      + + + +
        +
      • +

        contains

        +
        public boolean contains(String key)
        +
        Check if headers exists for a given key.
        +
        +
        Parameters:
        +
        key - The name of the header key.
        +
        Returns:
        +
        true if headers exist for the given key, false otherwise.
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageParameters.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageParameters.html new file mode 100644 index 0000000000..e95294463a --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/MessageParameters.html @@ -0,0 +1,387 @@ + + + + + +MessageParameters + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class MessageParameters

+
+
+ +
+
    +
  • +
    +
    +
    public class MessageParameters
    +extends Object
    +
  • +
+
+
+ +
+
+
    +
  • + + + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        get

        +
        @Deprecated
        +public String get(String key)
        +
        Deprecated. This method is deprecated and will soon be removed. Please use getParameter(key) + or getParameterList(key) instead.
        +
        Get the first parameter value for the given key.
        +
        +
        Parameters:
        +
        key - The name of the parameter key.
        +
        Returns:
        +
        The associated value or null if no value exists.
        +
        +
      • +
      + + + +
        +
      • +

        getParameter

        +
        public String getParameter(String key)
        +
        Get the first parameter value for the given key.
        +
        +
        Parameters:
        +
        key - The name of the parameter key.
        +
        Returns:
        +
        The associated value or null if no value exists.
        +
        +
      • +
      + + + +
        +
      • +

        getParameterList

        +
        public List<String> getParameterList(String key)
        +
        Get all parameter values for the given key.
        +
        +
        Parameters:
        +
        key - The name of parameter key.
        +
        Returns:
        +
        A list of all parameter values for the given key or null if no values exist.
        +
        +
      • +
      + + + +
        +
      • +

        getKeys

        +
        public Set<String> getKeys()
        +
        Get all parameter keys.
        +
        +
        Returns:
        +
        A set of all parameter keys.
        +
        +
      • +
      + + + +
        +
      • +

        contains

        +
        public boolean contains(String key)
        +
        Check if parameters exist for a given key.
        +
        +
        Parameters:
        +
        key - The name of the parameter key.
        +
        Returns:
        +
        true if parameters exist for the given key, false otherwise.
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Response.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Response.html new file mode 100644 index 0000000000..1dadd5b038 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Response.html @@ -0,0 +1,570 @@ + + + + + +Response + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class Response

+
+
+ +
+
    +
  • +
    +
    +
    public class Response
    +extends Object
    +
    This class represents a channel or destination response and is used to retrieve details such as + the response data, message status, and errors.
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Response

        +
        public Response()
        +
        Instantiates a new Response object.
        +
      • +
      + + + +
        +
      • +

        Response

        +
        public Response(String message)
        +
        Instantiates a new Response object.
        +
        +
        Parameters:
        +
        message - The actual response data.
        +
        +
      • +
      + + + +
        +
      • +

        Response

        +
        public Response(Status status,
        +                String message)
        +
        Instantiates a new Response object.
        +
        +
        Parameters:
        +
        status - The status (e.g. SENT, ERROR) of the response.
        +
        message - The actual response data.
        +
        +
      • +
      + + + +
        +
      • +

        Response

        +
        public Response(Status status,
        +                String message,
        +                String statusMessage)
        +
        Instantiates a new Response object.
        +
        +
        Parameters:
        +
        status - The status (e.g. SENT, ERROR) of the response.
        +
        message - The actual response data.
        +
        statusMessage - A brief message explaining the reason for the current status.
        +
        +
      • +
      + + + +
        +
      • +

        Response

        +
        public Response(Status status,
        +                String message,
        +                String statusMessage,
        +                String error)
        +
        Instantiates a new Response object.
        +
        +
        Parameters:
        +
        status - The status (e.g. SENT, ERROR) of the response.
        +
        message - The actual response data.
        +
        statusMessage - A brief message explaining the reason for the current status.
        +
        error - The error string associated with this response, if applicable.
        +
        +
      • +
      + + + +
        +
      • +

        Response

        +
        public Response(com.mirth.connect.donkey.model.message.Response response)
        +
        Instantiates a new Response object. + + NOTE: This should be excluded from the public Javadoc.
        +
        +
        Parameters:
        +
        response - The underlying Donkey Response object to reference.
        +
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getMessage

        +
        public String getMessage()
        +
        Returns the actual response data, as a string.
        +
        +
        Returns:
        +
        The actual response data, as a string.
        +
        +
      • +
      + + + +
        +
      • +

        setMessage

        +
        public void setMessage(String message)
        +
        Sets the response data.
        +
        +
        Parameters:
        +
        message - The response data (String) to use.
        +
        +
      • +
      + + + +
        +
      • +

        getStatus

        +
        public Status getStatus()
        +
        Returns the Status (e.g. SENT, QUEUED) of this response.
        +
        +
        Returns:
        +
        The Status (e.g. SENT, QUEUED) of this response.
        +
        +
      • +
      + + + +
        +
      • +

        setStatus

        +
        public void setStatus(Status status)
        +
        Sets the status of this response.
        +
        +
        Parameters:
        +
        status - The status (e.g. SENT, QUEUED) to use for this response.
        +
        +
      • +
      + + + +
        +
      • +

        getError

        +
        public String getError()
        +
        Returns the error string associated with this response, if it exists.
        +
        +
        Returns:
        +
        The error string associated with this response, if it exists.
        +
        +
      • +
      + + + +
        +
      • +

        setError

        +
        public void setError(String error)
        +
        Sets the error string to be associated with this response.
        +
        +
        Parameters:
        +
        error - The error string to use.
        +
        +
      • +
      + + + +
        +
      • +

        getStatusMessage

        +
        public String getStatusMessage()
        +
        Returns a brief message explaining the reason for the current status.
        +
        +
        Returns:
        +
        A brief message explaining the reason for the current status.
        +
        +
      • +
      + + + +
        +
      • +

        setStatusMessage

        +
        public void setStatusMessage(String statusMessage)
        +
        Sets the status message to use for this response.
        +
        +
        Parameters:
        +
        statusMessage - A brief message explaining the reason for the current status.
        +
        +
      • +
      + + + +
        +
      • +

        equals

        +
        public boolean equals(Object other)
        +
        +
        Overrides:
        +
        equals in class Object
        +
        +
      • +
      + + + + +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ResponseMap.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ResponseMap.html new file mode 100644 index 0000000000..7e78717986 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/ResponseMap.html @@ -0,0 +1,547 @@ + + + + + +ResponseMap + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class ResponseMap

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Map<String,Object>
    +
    +
    +
    +
    public class ResponseMap
    +extends Object
    +implements Map<String,Object>
    +
    A wrapper class for the response map which allows users to retrieve values using the proper "d#" + key (where "#" is the destination connector's metadata ID), or by using the actual destination + name.
    +
  • +
+
+
+ +
+
+ +
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Status.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Status.html new file mode 100644 index 0000000000..e814b38384 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/Status.html @@ -0,0 +1,402 @@ + + + + + +Status + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Enum Status

+
+
+ +
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    Serializable, Comparable<Status>
    +
    +
    +
    +
    public enum Status
    +extends Enum<Status>
    +
    Denotes the status of a connector message or response. Available statuses: + + RECEIVED, FILTERED, TRANSFORMED, SENT, QUEUED, ERROR, PENDING
    +
  • +
+
+
+ +
+
+
    +
  • + +
      +
    • + + +

      Enum Constant Detail

      + + + +
        +
      • +

        RECEIVED

        +
        public static final Status RECEIVED
        +
      • +
      + + + +
        +
      • +

        FILTERED

        +
        public static final Status FILTERED
        +
      • +
      + + + +
        +
      • +

        TRANSFORMED

        +
        public static final Status TRANSFORMED
        +
      • +
      + + + +
        +
      • +

        SENT

        +
        public static final Status SENT
        +
      • +
      + + + +
        +
      • +

        QUEUED

        +
        public static final Status QUEUED
        +
      • +
      + + + +
        +
      • +

        ERROR

        +
        public static final Status ERROR
        +
      • +
      + + + +
        +
      • +

        PENDING

        +
        public static final Status PENDING
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        values

        +
        public static Status[] values()
        +
        Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
        +for (Status c : Status.values())
        +    System.out.println(c);
        +
        +
        +
        Returns:
        +
        an array containing the constants of this enum type, in the order they are declared
        +
        +
      • +
      + + + +
        +
      • +

        valueOf

        +
        public static Status valueOf(String name)
        +
        Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
        +
        +
        Parameters:
        +
        name - the name of the enum constant to be returned.
        +
        Returns:
        +
        the enum constant with the specified name
        +
        Throws:
        +
        IllegalArgumentException - if this enum type has no constant with the specified name
        +
        NullPointerException - if the argument is null
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/XmlUtil.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/XmlUtil.html new file mode 100644 index 0000000000..06b713c58e --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/XmlUtil.html @@ -0,0 +1,479 @@ + + + + + +XmlUtil + + + + + + + + +
+ + + + + + + +
+ + + +
+
com.mirth.connect.userutil
+

Class XmlUtil

+
+
+ +
+
    +
  • +
    +
    +
    public class XmlUtil
    +extends Object
    +
    Provides XML utility methods.
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      All Methods Static Methods Concrete Methods 
      Modifier and TypeMethod and Description
      static Stringdecode(String entity) +
      Converts an XML/HTML entity reference into a string with the literal character.
      +
      static Stringencode(char s) +
      Encodes a character into the corresponding XML/HTML entity.
      +
      static Stringencode(char[] text, + int start, + int length) +
      Converts a character array, encoding characters into the corresponding XML/HTML entities as + needed.
      +
      static Stringencode(String s) +
      Converts a string, encoding characters into the corresponding XML/HTML entities as needed.
      +
      static StringprettyPrint(String input) +
      Formats an XML string with indented markup.
      +
      static StringtoJson(String xmlString) +
      Converts an XML string to JSON, while stripping bound namespace prefixes.
      +
      static StringtoJson(String xmlString, + boolean normalizeNamespaces) +
      Converts an XML string to JSON.
      +
      static StringtoJson(String xmlString, + boolean autoArray, + boolean autoPrimitive, + boolean prettyPrint, + boolean normalizeNamespaces) +
      Converts an XML string to JSON.
      +
      static StringtoJson(String xmlString, + boolean autoArray, + boolean autoPrimitive, + boolean prettyPrint, + boolean normalizeNamespaces, + boolean alwaysArray, + boolean alwaysExpandObjects) +
      Converts an XML string to JSON.
      +
      + +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        prettyPrint

        +
        public static String prettyPrint(String input)
        +
        Formats an XML string with indented markup.
        +
        +
        Parameters:
        +
        input - The XML string to format.
        +
        Returns:
        +
        The formatted XML string.
        +
        +
      • +
      + + + +
        +
      • +

        decode

        +
        public static String decode(String entity)
        +
        Converts an XML/HTML entity reference into a string with the literal character.
        +
        +
        Parameters:
        +
        entity - The XML/HTML entity to decode.
        +
        Returns:
        +
        A string containing the decoded character.
        +
        +
      • +
      + + + +
        +
      • +

        encode

        +
        public static String encode(char s)
        +
        Encodes a character into the corresponding XML/HTML entity.
        +
        +
        Parameters:
        +
        s - The character to encode.
        +
        Returns:
        +
        The encoded XML/HTML entity.
        +
        +
      • +
      + + + +
        +
      • +

        encode

        +
        public static String encode(String s)
        +
        Converts a string, encoding characters into the corresponding XML/HTML entities as needed.
        +
        +
        Parameters:
        +
        s - The string to encode.
        +
        Returns:
        +
        The encoded string with replaced XML/HTML entities.
        +
        +
      • +
      + + + +
        +
      • +

        encode

        +
        public static String encode(char[] text,
        +                            int start,
        +                            int length)
        +
        Converts a character array, encoding characters into the corresponding XML/HTML entities as + needed.
        +
        +
        Parameters:
        +
        text - The character array to encode.
        +
        start - The index to start at in the character array.
        +
        length - The maximum amount of characters to read from the array.
        +
        Returns:
        +
        The encoded string with replaced XML/HTML entities.
        +
        +
      • +
      + + + +
        +
      • +

        toJson

        +
        public static String toJson(String xmlString)
        +                     throws Exception
        +
        Converts an XML string to JSON, while stripping bound namespace prefixes.
        +
        +
        Parameters:
        +
        xmlString - The XML string to convert.
        +
        Returns:
        +
        The converted JSON string.
        +
        Throws:
        +
        Exception - If conversion failed.
        +
        +
      • +
      + + + +
        +
      • +

        toJson

        +
        public static String toJson(String xmlString,
        +                            boolean normalizeNamespaces)
        +                     throws Exception
        +
        Converts an XML string to JSON.
        +
        +
        Parameters:
        +
        xmlString - The XML string to convert.
        +
        normalizeNamespaces - Whether or not to normalize namespaces by stripping prefixes.
        +
        Returns:
        +
        The converted JSON string.
        +
        Throws:
        +
        Exception - If conversion failed.
        +
        +
      • +
      + + + +
        +
      • +

        toJson

        +
        public static String toJson(String xmlString,
        +                            boolean autoArray,
        +                            boolean autoPrimitive,
        +                            boolean prettyPrint,
        +                            boolean normalizeNamespaces)
        +                     throws Exception
        +
        Converts an XML string to JSON.
        +
        +
        Parameters:
        +
        xmlString - The XML string to convert.
        +
        autoArray - If true, sibling nodes with the same tag name will be consolidated into a JSON + array. If false, multiple properties with the same name will be present.
        +
        autoPrimitive - If true, element text will be converted to JSON primitive values where applicable. + If false, element text will always be converted to string values.
        +
        prettyPrint - Whether or not to fully indent the JSON output.
        +
        normalizeNamespaces - Whether or not to normalize namespaces by stripping prefixes.
        +
        Returns:
        +
        The converted JSON string.
        +
        Throws:
        +
        Exception - If conversion failed.
        +
        +
      • +
      + + + +
        +
      • +

        toJson

        +
        public static String toJson(String xmlString,
        +                            boolean autoArray,
        +                            boolean autoPrimitive,
        +                            boolean prettyPrint,
        +                            boolean normalizeNamespaces,
        +                            boolean alwaysArray,
        +                            boolean alwaysExpandObjects)
        +                     throws Exception
        +
        Converts an XML string to JSON.
        +
        +
        Parameters:
        +
        xmlString - The XML string to convert.
        +
        autoArray - If true, sibling nodes with the same tag name will be consolidated into a JSON + array. If false, multiple properties with the same name will be present.
        +
        autoPrimitive - If true, element text will be converted to JSON primitive values where applicable. + If false, element text will always be converted to string values.
        +
        prettyPrint - Whether or not to fully indent the JSON output.
        +
        normalizeNamespaces - Whether or not to normalize namespaces by stripping prefixes.
        +
        alwaysArray - If true, all nodes except for the top-level object will be written into JSON + arrays. Overrides the autoArray option.
        +
        alwaysExpandObjects - If true, all values will be written in the expanded "$" syntax.
        +
        Returns:
        +
        The converted JSON string.
        +
        Throws:
        +
        Exception - If conversion failed.
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-frame.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-frame.html new file mode 100644 index 0000000000..9431b8fc6e --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-frame.html @@ -0,0 +1,39 @@ + + + + + +com.mirth.connect.userutil + + + + + +

com.mirth.connect.userutil

+
+

Classes

+ +

Enums

+ +
+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-summary.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-summary.html new file mode 100644 index 0000000000..39f05a4e06 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-summary.html @@ -0,0 +1,265 @@ + + + + + +com.mirth.connect.userutil + + + + + + + + +
+ + + + + + + +
+ + +
+

Package com.mirth.connect.userutil

+
+
This package is included in the JavaScript scope on both the client and the server. Classes + in this package are part of the supported User API for use in channels/scripts. Reference to + any class in Mirth Connect outside of the userutil packages is unsupported.
+
+

See: Description

+
+
+ + + + +

Package com.mirth.connect.userutil Description

+
This package is included in the JavaScript scope on both the client and the server. Classes + in this package are part of the supported User API for use in channels/scripts. Reference to + any class in Mirth Connect outside of the userutil packages is unsupported.
+
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-tree.html b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-tree.html new file mode 100644 index 0000000000..ad19a20aa0 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/com/mirth/connect/userutil/package-tree.html @@ -0,0 +1,162 @@ + + + + + +com.mirth.connect.userutil Class Hierarchy + + + + + + + + +
+ + + + + + + +
+ + +
+

Hierarchy For Package com.mirth.connect.userutil

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +

Enum Hierarchy

+ +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/constant-values.html b/server/src/main/resources/docs/javadocs/user-api/constant-values.html new file mode 100644 index 0000000000..df99d4e280 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/constant-values.html @@ -0,0 +1,122 @@ + + + + + +Constant Field Values + + + + + + + + +
+ + + + + + + +
+ + +
+

Constant Field Values

+

Contents

+
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/deprecated-list.html b/server/src/main/resources/docs/javadocs/user-api/deprecated-list.html new file mode 100644 index 0000000000..426308317e --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/deprecated-list.html @@ -0,0 +1,283 @@ + + + + + +Deprecated List + + + + + + + + +
+ + + + + + + +
+ + +
+

Deprecated API

+

Contents

+ +
+
+ + + + + + + +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/help-doc.html b/server/src/main/resources/docs/javadocs/user-api/help-doc.html new file mode 100644 index 0000000000..c2d8290534 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/help-doc.html @@ -0,0 +1,223 @@ + + + + + +API Help + + + + + + + + +
+ + + + + + + +
+ + +
+

How This API Document Is Organized

+
This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
+
+
+ +This help file applies to API documentation generated using the standard doclet.
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/index-all.html b/server/src/main/resources/docs/javadocs/user-api/index-all.html new file mode 100644 index 0000000000..eb39ec9064 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/index-all.html @@ -0,0 +1,2925 @@ + + + + + +Index + + + + + + + + +
+ + + + + + + +
+ + +
A B C D E F G H I J K L M N P R S T U V W X  + + +

A

+
+
absolute(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
acceptChanges() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
acceptChanges(Connection) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
ACKGenerator - Class in com.mirth.connect.server.userutil
+
+
Allows users to generate HL7 v2.x acknowledgments based on an inbound message, with a specified + ACK code and custom text message.
+
+
ACKGenerator() - Constructor for class com.mirth.connect.server.userutil.ACKGenerator
+
+
Deprecated.
+
+
add(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
add(int, Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
add(Object, Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
+
Adds an entry to the map using the MapBuilder.put(java.lang.Object, java.lang.Object) method, and returns this builder.
+
+
addAll(Collection) - Method in class com.mirth.connect.userutil.ListBuilder
+
addAll(int, Collection) - Method in class com.mirth.connect.userutil.ListBuilder
+
addAttachment(List<Attachment>, Object, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Creates an Attachment and adds it to the provided list.
+
+
addAttachment(List<Attachment>, Object, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Creates an Attachment and adds it to the provided list.
+
+
addResponseHeader(String, String) - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Adds a new response header to be sent along with the authentication response.
+
+
addRowSetListener(RowSetListener) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
afterLast() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
AlertSender - Class in com.mirth.connect.server.userutil
+
+
Allows users to dispatch error events which can be alerted on.
+
+
AlertSender(String) - Constructor for class com.mirth.connect.server.userutil.AlertSender
+
+
Instantiates a new AlertSender.
+
+
AlertSender(ImmutableConnectorMessage) - Constructor for class com.mirth.connect.server.userutil.AlertSender
+
+
Instantiates a new AlertSender.
+
+
append(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
+
Adds an element to the list using the ListBuilder.add(java.lang.Object) method, and returns this builder.
+
+
Attachment - Class in com.mirth.connect.server.userutil
+
+
Used to store and retrieve details about message attachments such as the ID, MIME type, and + content.
+
+
Attachment() - Constructor for class com.mirth.connect.server.userutil.Attachment
+
+
Instantiates a new Attachment with no ID, content, or MIME type.
+
+
Attachment(String, byte[], String) - Constructor for class com.mirth.connect.server.userutil.Attachment
+
+
Instantiates a new Attachment.
+
+
Attachment(String, String, String) - Constructor for class com.mirth.connect.server.userutil.Attachment
+
+
Instantiates a new Attachment with String data using UTF-8 charset encoding.
+
+
Attachment(String, String, String, String) - Constructor for class com.mirth.connect.server.userutil.Attachment
+
+
Instantiates a new Attachment with String data and a given charset encoding.
+
+
AttachmentEntry - Class in com.mirth.connect.userutil
+
+
Used to store and retrieve details about message attachments such as the name, contents, and + MIME type.
+
+
AttachmentEntry() - Constructor for class com.mirth.connect.userutil.AttachmentEntry
+
+
Instantiates a new AttachmentEntry with no name, content, or MIME type.
+
+
AttachmentEntry(AttachmentEntry) - Constructor for class com.mirth.connect.userutil.AttachmentEntry
+
+
Instantiates a new AttachmentEntry that copies the name, content, and MIME type + from a given AttachmentEntry object.
+
+
AttachmentEntry(String, String, String) - Constructor for class com.mirth.connect.userutil.AttachmentEntry
+
+
Instantiates a new AttachmentEntry with a name, content, and a MIME type.
+
+
AttachmentUtil - Class in com.mirth.connect.server.userutil
+
+
Provides utility methods for creating, retrieving, and re-attaching message attachments.
+
+
AuthenticationResult - Class in com.mirth.connect.plugins.httpauth.userutil
+
+
This class represents the result of an HTTP authentication attempt, used to accept or reject + requests coming into HTTP-based source connectors.
+
+
AuthenticationResult(AuthStatus) - Constructor for class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Instantiates a new AuthenticationResult object.
+
+
AuthStatus - Enum in com.mirth.connect.plugins.httpauth.userutil
+
+
Denotes the result of an HTTP authentication attempt.
+
+
+ + + +

B

+
+
beforeFirst() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
byteArrayToDicomObject(byte[], boolean) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts a byte array into a dcm4che DicomObject.
+
+
+ + + +

C

+
+
cancel(boolean) - Method in class com.mirth.connect.server.userutil.Future
+
+
Attempts to cancel execution of this task.
+
+
cancelRowUpdates() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
Challenged(String) - Static method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Convenience method to create a new AuthenticationResult with the CHALLENGED status.
+
+
ChannelMap - Class in com.mirth.connect.server.userutil
+
+
A wrapper class for the channel map that checks against the source map in the get(key) method for legacy support.
+
+
ChannelMap(Map<String, Object>, Map<String, Object>) - Constructor for class com.mirth.connect.server.userutil.ChannelMap
+
+
Instantiates a new ChannelMap object.
+
+
ChannelUtil - Class in com.mirth.connect.server.userutil
+
+
This utility class allows the user to query information from channels or to perform actions on + channels.
+
+
clear() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
clear() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
clear() - Method in class com.mirth.connect.userutil.ListBuilder
+
clear() - Method in class com.mirth.connect.userutil.MapBuilder
+
clear() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
clearMessage() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Removes references to any data (textual or binary) currently stored by the raw message.
+
+
clearParameters() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
clearWarnings() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
close() - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Closes the database connection.
+
+
close() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
columnUpdated(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
columnUpdated(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
com.mirth.connect.plugins.httpauth.userutil - package com.mirth.connect.plugins.httpauth.userutil
+
+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+
com.mirth.connect.server.userutil - package com.mirth.connect.server.userutil
+
+
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
+
com.mirth.connect.userutil - package com.mirth.connect.userutil
+
+
This package is included in the JavaScript scope on both the client and the server. Classes + in this package are part of the supported User API for use in channels/scripts. Reference to + any class in Mirth Connect outside of the userutil packages is unsupported.
+
+
commit() - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Makes all changes made since the previous commit/rollback permanent and releases any database + locks currently held by this DatabaseConnection object.
+
+
commit() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
contains(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
contains(String) - Method in class com.mirth.connect.userutil.MessageHeaders
+
+
Check if headers exists for a given key.
+
+
contains(String) - Method in class com.mirth.connect.userutil.MessageParameters
+
+
Check if parameters exist for a given key.
+
+
containsAll(Collection) - Method in class com.mirth.connect.userutil.ListBuilder
+
containsKey(Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
containsKey(Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
containsKey(Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
containsKey(Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
containsValue(Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
containsValue(Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
containsValue(Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
containsValue(Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
ContentType - Enum in com.mirth.connect.userutil
+
+
Denotes various types of content created by a channel.
+
+
ContextFactory - Class in com.mirth.connect.server.userutil
+
+
Allows the user to retrieve information about the current JavaScript context.
+
+
ContextFactory(MirthContextFactory) - Constructor for class com.mirth.connect.server.userutil.ContextFactory
+
+
Instantiates a new ContextFactory object.
+
+
convertDate(String, String, String) - Static method in class com.mirth.connect.server.userutil.DateUtil
+
+
Parses a date string according to a specified input pattern, and formats the date back to a + string according to a specified output pattern.
+
+
convertDICOM(String, ImmutableConnectorMessage, boolean) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOM(String, ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOM(String, ImmutableConnectorMessage, int) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOM(String, ImmutableConnectorMessage, int, boolean) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOMToByteArray(String, ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOMToByteArray(String, ImmutableConnectorMessage, int) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
convertDICOMToByteArray(String, ImmutableConnectorMessage, int, boolean) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts merged DICOM data associated with a connector message into a specified image format.
+
+
createAttachment(ImmutableConnectorMessage, Object, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Creates an attachment associated with a given connector message, and inserts it into the + database.
+
+
createAttachment(ImmutableConnectorMessage, Object, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Creates an attachment associated with a given connector message, and inserts it into the + database.
+
+
createConnection(String, String, String, String) - Method in class com.mirth.connect.server.userutil.DatabaseConnectionFactory
+
+
Instantiates and returns a new java.sql.Connection object with the given connection + parameters.
+
+
createCopy() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
createCopyNoConstraints() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
createCopySchema() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
createDatabaseConnection(String, String, String, String) - Method in class com.mirth.connect.server.userutil.DatabaseConnectionFactory
+
+
Instantiates and returns a new DatabaseConnection object with the given connection + parameters.
+
+
createDatabaseConnection(String, String) - Method in class com.mirth.connect.server.userutil.DatabaseConnectionFactory
+
+
Instantiates and returns a new DatabaseConnection object with the given connection + parameters.
+
+
createShared() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
createSMTPConnection() - Static method in class com.mirth.connect.server.userutil.SMTPConnectionFactory
+
+
Creates an create SMTPConnection object using the server's default SMTP settings.
+
+
+ + + +

D

+
+
DatabaseConnection - Class in com.mirth.connect.server.userutil
+
+
Provides the ability to run SQL queries again the database connection object instantiated using + DatabaseConnectionFactory.
+
+
DatabaseConnection(String) - Constructor for class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Instantiates a new database connection with the given server address.
+
+
DatabaseConnection(String, Properties) - Constructor for class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Instantiates a new database connection with the given server address and connection + arguments.
+
+
DatabaseConnection(Driver, String) - Constructor for class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Instantiates a new database connection with the given driver instance and server address.
+
+
DatabaseConnection(Driver, String, Properties) - Constructor for class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Instantiates a new database connection with the given driver instance, server address, and + connection arguments.
+
+
DatabaseConnectionFactory - Class in com.mirth.connect.server.userutil
+
+
Used to create database connection objects.
+
+
DatabaseConnectionFactory(MirthContextFactory) - Constructor for class com.mirth.connect.server.userutil.DatabaseConnectionFactory
+
 
+
DateUtil - Class in com.mirth.connect.server.userutil
+
+
Provides date/time utility methods.
+
+
decode(String) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Decodes a Base64 string into octets.
+
+
decode(String) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts an XML/HTML entity reference into a string with the literal character.
+
+
decrypt(String) - Static method in class com.mirth.connect.server.userutil.EncryptionUtil
+
+
Convenience method for decrypting data.
+
+
decrypt(String, byte[]) - Static method in class com.mirth.connect.server.userutil.EncryptionUtil
+
+
Convenience method for decrypting data.
+
+
deleteFile(File) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Deletes a specified File.
+
+
deleteRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
deployChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Deploy a channel.
+
+
DeployedState - Enum in com.mirth.connect.server.userutil
+
+
States of UNDEPLOYED, DEPLOYING, UNDEPLOYING, STARTING, STARTED, PAUSING, PAUSED, STOPPING, + STOPPED
+
+
DestinationSet - Class in com.mirth.connect.server.userutil
+
+
Utility class used in the preprocessor or source filter/transformer to prevent the message from + being sent to specific destinations.
+
+
DestinationSet(ImmutableConnectorMessage) - Constructor for class com.mirth.connect.server.userutil.DestinationSet
+
+
DestinationSet instances should NOT be constructed manually.
+
+
dicomObjectToByteArray(DicomObject) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Converts a dcm4che DicomObject into a byte array.
+
+
DICOMUtil - Class in com.mirth.connect.server.userutil
+
+
Provides DICOM utility methods.
+
+
+ + + +

E

+
+
encode(byte[]) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Encoded binary data into a Base64 string.
+
+
encode(char) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Encodes a character into the corresponding XML/HTML entity.
+
+
encode(String) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts a string, encoding characters into the corresponding XML/HTML entities as needed.
+
+
encode(char[], int, int) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts a character array, encoding characters into the corresponding XML/HTML entities as + needed.
+
+
encrypt(String) - Static method in class com.mirth.connect.server.userutil.EncryptionUtil
+
+
Convenience method for encrypting data.
+
+
encrypt(byte[]) - Static method in class com.mirth.connect.server.userutil.EncryptionUtil
+
+
Convenience method for encrypting data.
+
+
EncryptedData - Class in com.mirth.connect.server.userutil
+
+
This object is returned from EncryptionUtil.encrypt(byte[]).
+
+
EncryptedData(String, byte[]) - Constructor for class com.mirth.connect.server.userutil.EncryptedData
+
 
+
EncryptionUtil - Class in com.mirth.connect.server.userutil
+
+
This utility class provides some convenience methods for encrypting or decrypting data.
+
+
EncryptionUtil() - Constructor for class com.mirth.connect.server.userutil.EncryptionUtil
+
 
+
entrySet() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
entrySet() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
entrySet() - Method in class com.mirth.connect.userutil.MapBuilder
+
entrySet() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
equals(Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
equals(Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
equals(Object) - Method in class com.mirth.connect.userutil.AttachmentEntry
+
 
+
equals(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
equals(Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
equals(Object) - Method in class com.mirth.connect.userutil.Response
+
equals(Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
escape(String) - Static method in class com.mirth.connect.userutil.JsonUtil
+
+
Escapes any special JSON characters in the input.
+
+
execute() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
execute(Connection) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
executeCachedQuery(String) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes a query on the database and returns a CachedRowSet.
+
+
executeCachedQuery(String, List<Object>) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes a prepared query on the database and returns a CachedRowSet.
+
+
executeUpdate(String) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes an INSERT/UPDATE on the database and returns the row count.
+
+
executeUpdate(String, List<Object>) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes a prepared INSERT/UPDATE statement on the database and returns the row count.
+
+
executeUpdateAndGetGeneratedKeys(String) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes an INSERT/UPDATE statement on the database and returns a CachedRowSet containing any + generated keys.
+
+
executeUpdateAndGetGeneratedKeys(String, List<Object>) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Executes a prepared INSERT/UPDATE statement on the database and returns a CachedRowSet + containing any generated keys.
+
+
+ + + +

F

+
+
Failure() - Static method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Convenience method to create a new AuthenticationResult with the FAILURE status.
+
+
FileUtil - Class in com.mirth.connect.server.userutil
+
+
Provides file utility methods.
+
+
findColumn(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
first() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
formatDate(String, Date) - Static method in class com.mirth.connect.server.userutil.DateUtil
+
+
Formats a java.util.Date object into a string according to a specified pattern.
+
+
formatNCPDPNumber(String, int) - Static method in class com.mirth.connect.server.userutil.NCPDPUtil
+
+
Converts a signed overpunch code into a string representing the appropriate decimal value.
+
+
Future<V> - Class in com.mirth.connect.server.userutil
+
+
A Future represents the result of an asynchronous computation.
+
+
+ + + +

G

+
+
generate(Object) - Static method in class com.mirth.connect.server.userutil.HashUtil
+
+
Takes in any object and generates a SHA-256 hex hash.
+
+
generate(String, String, String) - Static method in class com.mirth.connect.server.userutil.HashUtil
+
+
Takes in a string, an encoding, and a hashing algorithm and generates a hex hash.
+
+
generate(byte[], String) - Static method in class com.mirth.connect.server.userutil.HashUtil
+
+
Takes in a byte[], an encoding, and a hashing algorithm and generates a hex hash.
+
+
generateAckResponse(String, String, String) - Static method in class com.mirth.connect.server.userutil.ACKGenerator
+
+
Generates an HL7 v2.x acknowledgment.
+
+
generateAckResponse(String, String, String, String, String, String) - Static method in class com.mirth.connect.server.userutil.ACKGenerator
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + generateAckResponse(message, isXML, acknowledgementCode, textMessage, dateFormat, + errorMessage) instead.
+
+
+
generateAckResponse(String, boolean, String, String, String, String) - Static method in class com.mirth.connect.server.userutil.ACKGenerator
+
+
Generates an HL7 v2.x acknowledgment.
+
+
get(Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
+
Returns the value to which the specified key is mapped, or null if this map contains no + mapping for the key.
+
+
get() - Method in class com.mirth.connect.server.userutil.Future
+
+
Waits if necessary for the computation to complete, and then retrieves its result.
+
+
get(long) - Method in class com.mirth.connect.server.userutil.Future
+
+
Waits if necessary for at most the given time for the computation to complete, and then + retrieves its result, if available.
+
+
get(long, TimeUnit) - Method in class com.mirth.connect.server.userutil.Future
+
+
Waits if necessary for at most the given time for the computation to complete, and then + retrieves its result, if available.
+
+
get(Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
get(int) - Method in class com.mirth.connect.userutil.ListBuilder
+
get(Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
get(String) - Method in class com.mirth.connect.userutil.MessageHeaders
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use getHeader(key) or + getHeaderList(key) instead.
+
+
+
get(String) - Method in class com.mirth.connect.userutil.MessageParameters
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use getParameter(key) + or getParameterList(key) instead.
+
+
+
get(Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
+
Returns the value to which the specified key is mapped, or null if this map contains no + mapping for the key.
+
+
getAddress() - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Returns the server address.
+
+
getArray(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getArray(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getAsciiStream(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getAsciiStream(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getAttachmentId() - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the unique replacement token for the attachment.
+
+
getAttachmentId() - Method in class com.mirth.connect.userutil.ImmutableAttachment
+
+
Returns the unique replacement token for the attachment.
+
+
getAttachments() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns a list of attachments associated with this message.
+
+
getBigDecimal(String, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBigDecimal(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBigDecimal(int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBigDecimal(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBinaryStream(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBinaryStream(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBlob(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBlob(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBoolean(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBoolean(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getByte(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getByte(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBytes(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getBytes(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getChannelId() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the ID of the channel associated with this connector message.
+
+
getChannelId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the ID of the channel associated with this message.
+
+
getChannelIds() - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get all channel Ids.
+
+
getChannelMap() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + RawMessage.getSourceMap() instead.
+
+
+
getChannelMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the channel map.
+
+
getChannelName(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the name for a channel.
+
+
getChannelName() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the Name of the channel associated with this connector message.
+
+
getChannelNames() - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get all channels names.
+
+
getChannelState(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the current state of a channel.
+
+
getCharacterStream(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getCharacterStream(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getClassLoader() - Method in class com.mirth.connect.server.userutil.ContextFactory
+
+
Returns the application classloader that the current JavaScript context is using.
+
+
getClob(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getClob(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getCommand() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getConcurrency() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getConnection() - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Returns the database connection (java.sql.Connection) this class is using.
+
+
getConnectorMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the connector map.
+
+
getConnectorMessages() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns a map of connector messages associated with this message.
+
+
getConnectorName() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the name of the connector associated with this connector message.
+
+
getConnectorState(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the current state of a connector.
+
+
getContent() - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the content of the attachment as a byte array.
+
+
getContent() - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Returns the content of the attachment entry.
+
+
getContent() - Method in class com.mirth.connect.userutil.ImmutableAttachment
+
+
Returns the content of the attachment as a byte array.
+
+
getContent(ContentType) - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Deprecated. +
The getContent(contentType) method has been deprecated and will soon be removed. + Please use getMessageContent(contentType) instead.
+
+
+
getContent() - Method in class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Returns the actual content, as a string.
+
+
getContentString() - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the content of the attachment as a string, using UTF-8 encoding.
+
+
getContentString(String) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the content of the attachment as a string, using the specified charset encoding.
+
+
getContentType() - Method in class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Returns the ContentType of this message content (e.g.
+
+
getCurrentDate(String) - Static method in class com.mirth.connect.server.userutil.DateUtil
+
+
Formats the current date into a string according to a specified pattern.
+
+
getCursorName() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDataSourceName() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDataType() - Method in class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Returns the data type (e.g.
+
+
getDate(String, String) - Static method in class com.mirth.connect.server.userutil.DateUtil
+
+
Parses a date string according to the specified pattern and returns a java.util.Date object.
+
+
getDate(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDate(String, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDate(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDate(int, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDefaultDeserializationProperties(String) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Returns a map of default properties used to customize how deserialization from XML to the + data type is performed.
+
+
getDefaultSerializationProperties(String) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Returns a map of default properties used to customize how serialization from the data type to + XML is performed.
+
+
getDeployedChannelId(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the id for a deployed channel.
+
+
getDeployedChannelIds() - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get all deployed channel Ids.
+
+
getDeployedChannelName(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the name for a deployed channel.
+
+
getDeployedChannelNames() - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get all deployed channels names.
+
+
getDestinationIdMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns a Map of destination connector names linked to their corresponding connector metadata + ID.
+
+
getDestinationIdMap() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns a Map of destination connector names linked to their corresponding connector metadata + ID.
+
+
getDestinationMetaDataIds() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Returns the collection of integers (metadata IDs) representing which destinations to dispatch + the message to.
+
+
getDestinationNameMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getDestinationIdMap() instead.
+
+
+
getDestinationNameMap() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getDestinationIdMap() instead.
+
+
+
getDICOMMessage(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a byte array.
+
+
getDICOMRawBytes(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a byte array.
+
+
getDICOMRawData(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a Base64-encoded string.
+
+
getDouble(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getDouble(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getEDISerializer(String, String, String) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
+
+
+
getEncoded() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves encoded content associated with this connector message.
+
+
getEncodedData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves encoded content associated with this connector message.
+
+
getEncryptedData() - Method in class com.mirth.connect.server.userutil.EncryptedData
+
+
Returns the encrypted data as a byte array.
+
+
getError() - Method in class com.mirth.connect.server.userutil.ImmutableResponse
+
+
Returns the error string associated with this response, if it exists.
+
+
getError() - Method in class com.mirth.connect.userutil.Response
+
+
Returns the error string associated with this response, if it exists.
+
+
getErrorCount(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the error count statistic for a specific channel.
+
+
getErrorCount(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the error count statistic for a specific connector.
+
+
getErrorResponse(String) - Static method in class com.mirth.connect.server.userutil.ResponseFactory
+
+
Returns a Response representing a erred message.
+
+
getEscapeProcessing() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getFetchDirection() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getFetchSize() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getFilteredCount(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the filtered count statistic for a specific channel.
+
+
getFilteredCount(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the filtered count statistic for a specific connector.
+
+
getFilteredResponse(String) - Static method in class com.mirth.connect.server.userutil.ResponseFactory
+
+
Returns a Response representing a filtered message.
+
+
getFloat(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getFloat(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getFrom() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the FROM field being used for dispatched e-mail messages.
+
+
getHeader() - Method in class com.mirth.connect.server.userutil.EncryptedData
+
+
Returns the meta-information about the encrypted data.
+
+
getHeader(String) - Method in class com.mirth.connect.userutil.MessageHeaders
+
+
Get the first header value for the given key.
+
+
getHeaderList(String) - Method in class com.mirth.connect.userutil.MessageHeaders
+
+
Get all header values for the given key.
+
+
getHL7Serializer(boolean, boolean, boolean, boolean, boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
+
+
+
getHL7Serializer(boolean, boolean, boolean, boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
+
+
+
getHL7Serializer(boolean, boolean, boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
+
+
+
getHL7Serializer(boolean, boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
+
+
+
getHL7Serializer() - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead. The new method will now strip namespaces by default unless the + 'stripNamespaces' property is set to false.
+
+
+
getHoldability() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getHost() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the SMTP server address.
+
+
getId() - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the unique ID for the attachment.
+
+
getId() - Method in class com.mirth.connect.userutil.ImmutableAttachment
+
+
Returns the unique ID for the attachment.
+
+
getImportChannelId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the ID of the original channel this message was reprocessed from.
+
+
getImportId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the ID of the original message this one was imported from.
+
+
getInt(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getInt(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getIsolatedClassLoader() - Method in class com.mirth.connect.server.userutil.ContextFactory
+
+
Returns a classloader containing only the libraries contained in the custom resources, with + no parent classloader.
+
+
getKeyColumns() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getKeys() - Method in class com.mirth.connect.userutil.MessageHeaders
+
+
Get all header keys.
+
+
getKeys() - Method in class com.mirth.connect.userutil.MessageParameters
+
+
Get all parameter keys.
+
+
getLong(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getLong(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMatchColumnIndexes() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMatchColumnNames() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMaxFieldSize() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMaxRows() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMergedConnectorMessage() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns a "merged" connector message containing data from all connector messages combined.
+
+
getMessage() - Method in class com.mirth.connect.server.userutil.ImmutableResponse
+
+
Returns the actual response data, as a string.
+
+
getMessage() - Method in class com.mirth.connect.userutil.Response
+
+
Returns the actual response data, as a string.
+
+
getMessageAttachment(ImmutableConnectorMessage, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from the current channel/message ID.
+
+
getMessageAttachment(ImmutableConnectorMessage, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from the current channel/message ID.
+
+
getMessageAttachment(String, Long, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from a specific channel/message ID.
+
+
getMessageAttachment(String, Long, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from a specific channel/message ID.
+
+
getMessageAttachmentIds(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Returns a List of attachment IDs associated with the current channel / message.
+
+
getMessageAttachmentIds(String, Long) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Returns a List of attachment IDs associated with the current channel / message.
+
+
getMessageAttachments(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves all attachments associated with a connector message.
+
+
getMessageAttachments(ImmutableConnectorMessage, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves all attachments associated with a connector message.
+
+
getMessageAttachments(String, Long) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves all attachments associated with a specific channel/message ID.
+
+
getMessageAttachments(String, Long, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves all attachments associated with a specific channel/message ID.
+
+
getMessageAttachmentsFromSourceChannel(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from an upstream channel that sent a message to the current channel.
+
+
getMessageAttachmentsFromSourceChannel(ImmutableConnectorMessage, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Retrieves an attachment from an upstream channel that sent a message to the current channel.
+
+
getMessageContent(ContentType) - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves content associated with this connector message.
+
+
getMessageId() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the sequential ID of the overall Message associated with this connector message.
+
+
getMessageId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the sequential ID of this message, as a Long.
+
+
getMessageId() - Method in class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Returns the sequential ID of the overall Message associated with this message content.
+
+
getMetaData() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getMetaDataId() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the metadata ID of this connector message.
+
+
getMetaDataId() - Method in class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Returns the metadata ID of the connector associated with this message content.
+
+
getMimeType() - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Returns the MIME type of the attachment entry.
+
+
getName() - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Returns the name of the attachment entry.
+
+
getNCharacterStream(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getNCharacterStream(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getNClob(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getNClob(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getNCPDPSerializer(String, String, String, boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
+
+
+
getNCPDPSerializer(String, String, String) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
+
+
+
getNewMessageStatus() - Method in class com.mirth.connect.server.userutil.ImmutableResponse
+
+
Returns the Status (e.g.
+
+
getNString(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getNString(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(String, Map<String, Class<?>>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(int, Map<String, Class<?>>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(int, Class<T>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getObject(String, Class<T>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getOriginal() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getOriginalId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the ID of the original message this one was reprocessed from.
+
+
getOriginalRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getPageSize() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getParameter(String) - Method in class com.mirth.connect.userutil.MessageParameters
+
+
Get the first parameter value for the given key.
+
+
getParameterList(String) - Method in class com.mirth.connect.userutil.MessageParameters
+
+
Get all parameter values for the given key.
+
+
getPassword() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getPassword() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the password being used to authenticate to the SMTP server.
+
+
getPort() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the SMTP server port.
+
+
getPostProcessorError() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the postprocessing error string associated with this connector message, if it exists.
+
+
getProcessedRaw() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves processed raw content associated with this connector message.
+
+
getProcessedRawData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves processed raw content associated with this connector message.
+
+
getProcessedResponse() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves processed response content associated with this connector message.
+
+
getProcessedResponseData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves processed response content associated with this connector message.
+
+
getProcessingError() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the processing error string associated with this connector message, if it exists.
+
+
getQueryTimeout() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getQueuedCount(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the queued count statistic for a specific channel.
+
+
getQueuedCount(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the queued count statistic for a specific connector.
+
+
getQueuedResponse(String) - Static method in class com.mirth.connect.server.userutil.ResponseFactory
+
+
Returns a Response representing a queued message.
+
+
getRaw() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves raw content associated with this connector message.
+
+
getRawBytes() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Returns the binary data (byte array) to be dispatched to a channel.
+
+
getRawData() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Returns the textual data to be dispatched to a channel.
+
+
getRawData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves raw content associated with this connector message.
+
+
getRealm() - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Returns the realm that the request has been authenticated with.
+
+
getReceivedCount(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the received count statistic for a specific channel.
+
+
getReceivedCount(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the received count statistic for a specific connector.
+
+
getReceivedDate() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the date/time that this connector message was created by the channel.
+
+
getReceivedDate() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Deprecated. +
This method is deprecated and will soon be removed. This method currently returns + the received date of the source connector message.
+
+
+
getRef(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getRef(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getResourceIds() - Method in class com.mirth.connect.server.userutil.ContextFactory
+
+
Returns the set of custom resource IDs that the current JavaScript context is using.
+
+
getResponse() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves response content associated with this connector message.
+
+
getResponseData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves response content associated with this connector message.
+
+
getResponseDate() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the date/time immediately after this connector message's response is received.
+
+
getResponseError() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the response error string associated with this connector message, if it exists.
+
+
getResponseHeaders() - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Returns the map of HTTP headers to be sent along with the authentication response.
+
+
getResponseMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the response map.
+
+
getResponseTransformed() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves transformed response content associated with this connector message.
+
+
getResponseTransformedData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves transformed response content associated with this connector message.
+
+
getRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getRowId(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getRowId(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getRowSetWarnings() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getSecure() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the encryption security layer being used for the SMTP connection (e.g "TLS" or + "SSL").
+
+
getSendAttempts() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the number of times this message has been attempted to be dispatched by the + connector.
+
+
getSendDate() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the date/time immediately before this connector message's most recent send attempt.
+
+
getSentCount(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the sent count statistic for a specific channel.
+
+
getSentCount(String, Number) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Get the sent count statistic for a specific connector.
+
+
getSentResponse(String) - Static method in class com.mirth.connect.server.userutil.ResponseFactory
+
+
Returns a Response representing a successfully sent message.
+
+
getSerializer(String) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Returns a serializer (with toXML and fromXML methods) for a given data type.
+
+
getSerializer(String, Map<String, Object>, Map<String, Object>) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Returns a serializer (with toXML and fromXML methods) for a given data type and properties.
+
+
getServerId() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the ID of the server associated with this connector message.
+
+
getServerId() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns the ID of the server associated with this message.
+
+
getShort(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getShort(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getShowDeleted() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getSliceCount(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Returns the number of slices in the fully-merged DICOM data associated with a given connector + message.
+
+
getSocketTimeout() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the socket connection timeout value in milliseconds.
+
+
getSourceMap() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Returns the source map to be used at the beginning of the channel dispatch.
+
+
getSourceMap() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the source map.
+
+
getSQLXML(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getSQLXML(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getStatement() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getStatus() - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Returns the accept/reject status of the authentication attempt.
+
+
getStatus() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Returns the status (e.g.
+
+
getStatus() - Method in class com.mirth.connect.userutil.Response
+
+
Returns the Status (e.g.
+
+
getStatusMessage() - Method in class com.mirth.connect.server.userutil.ImmutableResponse
+
+
Returns a brief message explaining the reason for the current status.
+
+
getStatusMessage() - Method in class com.mirth.connect.userutil.Response
+
+
Returns a brief message explaining the reason for the current status.
+
+
getString(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getString(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getSyncProvider() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTableName() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTime(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTime(String, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTime(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTime(int, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTimestamp(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTimestamp(String, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTimestamp(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTimestamp(int, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTransactionIsolation() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getTransformed() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves transformed content associated with this connector message.
+
+
getTransformedData() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Retrieves transformed content associated with this connector message.
+
+
getType() - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Returns the MIME type of the attachment.
+
+
getType() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getType() - Method in class com.mirth.connect.userutil.ImmutableAttachment
+
+
Returns the MIME type of the attachment.
+
+
getTypeMap() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getUnicodeStream(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getUnicodeStream(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getURL(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getUrl() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getURL(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getUsername() - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Returns the username that the request has been authenticated with.
+
+
getUsername() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getUsername() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns the username being used to authenticate to the SMTP server.
+
+
getUUID() - Static method in class com.mirth.connect.server.userutil.UUIDGenerator
+
+
Returns a type 4 (pseudo randomly generated) UUID.
+
+
getWarnings() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
getX12Serializer(boolean) - Static method in class com.mirth.connect.server.userutil.SerializerFactory
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + getSerializer(dataType, serializationPropertiesMap, deserializationPropertiesMap) + instead.
+
+
+
+ + + +

H

+
+
haltChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Halt a deployed channel.
+
+
hashCode() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
hashCode() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
hashCode() - Method in class com.mirth.connect.userutil.ListBuilder
+
hashCode() - Method in class com.mirth.connect.userutil.MapBuilder
+
hashCode() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
HashUtil - Class in com.mirth.connect.server.userutil
+
+
Provides hash utility methods.
+
+
httpBodyToXml(InputStream, String) - Static method in class com.mirth.connect.server.userutil.HTTPUtil
+
+
Serializes an HTTP request body into XML.
+
+
httpBodyToXml(String, String) - Static method in class com.mirth.connect.server.userutil.HTTPUtil
+
+
Serializes an HTTP request body into XML.
+
+
HTTPUtil - Class in com.mirth.connect.server.userutil
+
+
Provides HTTP utility methods.
+
+
+ + + +

I

+
+
ImmutableAttachment - Class in com.mirth.connect.userutil
+
+
This class represents an message attachment and is used to retrieve details such as the + replacement token or content type.
+
+
ImmutableAttachment(Attachment) - Constructor for class com.mirth.connect.userutil.ImmutableAttachment
+
+
Instantiates a new ImmutableAttachment object.
+
+
ImmutableConnectorMessage - Class in com.mirth.connect.userutil
+
+
This class represents a connector message and is used to retrieve details such as the message ID, + metadata ID, status, and various content types.
+
+
ImmutableConnectorMessage(ConnectorMessage) - Constructor for class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Instantiates a new ImmutableConnectorMessage object.
+
+
ImmutableConnectorMessage(ConnectorMessage, boolean) - Constructor for class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Instantiates a new ImmutableConnectorMessage object.
+
+
ImmutableConnectorMessage(ConnectorMessage, boolean, Map<String, Integer>) - Constructor for class com.mirth.connect.userutil.ImmutableConnectorMessage
+
+
Instantiates a new ImmutableConnectorMessage object.
+
+
ImmutableMessage - Class in com.mirth.connect.userutil
+
+
This class represents an overall message and is used to retrieve details such as the message ID, + specific connector messages, or the merged connector message.
+
+
ImmutableMessage(Message) - Constructor for class com.mirth.connect.userutil.ImmutableMessage
+
+
Instantiates a new ImmutableMessage object.
+
+
ImmutableMessageContent - Class in com.mirth.connect.userutil
+
+
This class represents content associated with a connector message.
+
+
ImmutableMessageContent(MessageContent) - Constructor for class com.mirth.connect.userutil.ImmutableMessageContent
+
+
Instantiates a new ImmutableMessageContent object.
+
+
ImmutableResponse - Class in com.mirth.connect.server.userutil
+
+
This class represents a destination response and is used to retrieve details such as the response + data, message status, and errors.
+
+
ImmutableResponse(Response) - Constructor for class com.mirth.connect.server.userutil.ImmutableResponse
+
+
Instantiates a new ImmutableResponse object.
+
+
indexOf(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
initializeDriver(String) - Method in class com.mirth.connect.server.userutil.DatabaseConnectionFactory
+
+
Initializes the specified JDBC driver.
+
+
insertRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isAfterLast() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isBeforeFirst() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isBinary() - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Returns a Boolean representing whether this object contains textual or binary data.
+
+
isCancelled() - Method in class com.mirth.connect.server.userutil.Future
+
+
Returns true if this task was cancelled before it completed normally.
+
+
isChannelDeployed(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Check if a channel is currently deployed.
+
+
isClosed() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isDone() - Method in class com.mirth.connect.server.userutil.Future
+
+
Returns true if this task completed.
+
+
isEmpty() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
isEmpty() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
isEmpty() - Method in class com.mirth.connect.userutil.ListBuilder
+
isEmpty() - Method in class com.mirth.connect.userutil.MapBuilder
+
isEmpty() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
isEncrypted() - Method in class com.mirth.connect.userutil.ImmutableAttachment
+
+
Returns a boolean indicating whether the attachment content is encrypted.
+
+
isFirst() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isLast() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isProcessed() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
+
Returns whether this message has finished processing through a channel.
+
+
isReadOnly() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
isUseAuthentication() - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Returns true if authentication is needed for the SMTP server, otherwise returns false.
+
+
isWrapperFor(Class<?>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
iterator() - Method in class com.mirth.connect.userutil.ListBuilder
+
+ + + +

J

+
+
JsonUtil - Class in com.mirth.connect.userutil
+
+
Provides JSON utility methods.
+
+
+ + + +

K

+
+
keySet() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
keySet() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
keySet() - Method in class com.mirth.connect.userutil.MapBuilder
+
keySet() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
+ + + +

L

+
+
last() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
lastIndexOf(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
list() - Static method in class com.mirth.connect.userutil.Lists
+
+
Instantiates a new ListBuilder using an ArrayList.
+
+
list(Object) - Static method in class com.mirth.connect.userutil.Lists
+
+
Instantiates a new ListBuilder using an ArrayList and the given element.
+
+
list(List) - Static method in class com.mirth.connect.userutil.Lists
+
+
Instantiates a new ListBuilder using the given list.
+
+
ListBuilder - Class in com.mirth.connect.userutil
+
+
Convenience class to allow fluent building of lists.
+
+
listIterator() - Method in class com.mirth.connect.userutil.ListBuilder
+
listIterator(int) - Method in class com.mirth.connect.userutil.ListBuilder
+
Lists - Class in com.mirth.connect.userutil
+
+
Convenience class to allow fluent building of lists.
+
+
Lists() - Constructor for class com.mirth.connect.userutil.Lists
+
 
+
+ + + +

M

+
+
map() - Static method in class com.mirth.connect.userutil.Maps
+
+
Instantiates a new MapBuilder using a HashMap.
+
+
map(Object, Object) - Static method in class com.mirth.connect.userutil.Maps
+
+
Instantiates a new MapBuilder using a HashMap and the given key/value entry.
+
+
map(Map) - Static method in class com.mirth.connect.userutil.Maps
+
+
Instantiates a new MapBuilder using the given map.
+
+
MapBuilder - Class in com.mirth.connect.userutil
+
+
Convenience class to allow fluent building of maps.
+
+
Maps - Class in com.mirth.connect.userutil
+
+
Convenience class to allow fluent building of maps.
+
+
Maps() - Constructor for class com.mirth.connect.userutil.Maps
+
 
+
mergeHeaderAttachments(ImmutableConnectorMessage, List<Attachment>) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Re-attaches DICOM attachments with the header data in the connector message and returns the + resulting merged data as a Base-64 encoded String.
+
+
mergeHeaderPixelData(byte[], List<byte[]>) - Static method in class com.mirth.connect.server.userutil.DICOMUtil
+
+
Re-attaches DICOM attachments with the given header data and returns the resulting merged + data as a Base-64 encoded String.
+
+
MessageHeaders - Class in com.mirth.connect.userutil
+
 
+
MessageHeaders(Map<String, List<String>>) - Constructor for class com.mirth.connect.userutil.MessageHeaders
+
 
+
MessageParameters - Class in com.mirth.connect.userutil
+
 
+
MessageParameters(Map<String, List<String>>) - Constructor for class com.mirth.connect.userutil.MessageParameters
+
 
+
MirthCachedRowSet - Class in com.mirth.connect.server.userutil
+
+
An implementation of CachedRowSet that retrieves values based on the column label value.
+
+
MirthCachedRowSet() - Constructor for class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
moveToCurrentRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
moveToInsertRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
+ + + +

N

+
+
NCPDPUtil - Class in com.mirth.connect.server.userutil
+
+
Provides NCPDP utility methods.
+
+
next() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
nextPage() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
+ + + +

P

+
+
parseHeaders(String) - Static method in class com.mirth.connect.server.userutil.HTTPUtil
+
+
Converts a block of HTTP header fields into a Map containing each header key and value.
+
+
pauseChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Pause a deployed channel.
+
+
populate(ResultSet) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
populate(ResultSet, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
prettyPrint(String) - Static method in class com.mirth.connect.userutil.JsonUtil
+
+
Formats an JSON string with indented markup.
+
+
prettyPrint(String) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Formats an XML string with indented markup.
+
+
previous() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
previousPage() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
put(String, Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
put(String, Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
put(Object, Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
put(String, Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
putAll(Map<? extends String, ? extends Object>) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
putAll(Map<? extends String, ? extends Object>) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
putAll(Map) - Method in class com.mirth.connect.userutil.MapBuilder
+
putAll(Map<? extends String, ? extends Object>) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
+ + + +

R

+
+
RawMessage - Class in com.mirth.connect.server.userutil
+
+
This class represents a raw message as it is received by a channel, and is used to retrieve + details such as the raw data or source map.
+
+
RawMessage(String) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
RawMessage(String, Collection<Number>) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
RawMessage(String, Collection<Number>, Map<String, Object>) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
RawMessage(byte[]) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
RawMessage(byte[], Collection<Number>) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
RawMessage(byte[], Collection<Number>, Map<String, Object>) - Constructor for class com.mirth.connect.server.userutil.RawMessage
+
+
Instantiates a RawMessage object to dispatch to a channel.
+
+
read(String) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Returns the contents of the file as a string, using the system default charset encoding.
+
+
readBytes(String) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Returns the contents of the file as a byte array.
+
+
reAttachMessage(String, ImmutableConnectorMessage, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Replaces any unique attachment tokens (e.g.
+
+
reAttachMessage(String, ImmutableConnectorMessage, String, boolean, boolean, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Replaces any unique attachment tokens (e.g.
+
+
reAttachMessage(ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Replaces any unique attachment tokens (e.g.
+
+
reAttachMessage(String, ImmutableConnectorMessage) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Replaces any unique attachment tokens (e.g.
+
+
refreshRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
relative(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
release() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
remove(Object) - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
remove(Object) - Method in class com.mirth.connect.server.userutil.DestinationSet
+
+
Stop a destination from being processed for this message.
+
+
remove(Collection<Object>) - Method in class com.mirth.connect.server.userutil.DestinationSet
+
+
Stop a destination from being processed for this message.
+
+
remove(Object) - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
remove(Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
remove(int) - Method in class com.mirth.connect.userutil.ListBuilder
+
remove(Object) - Method in class com.mirth.connect.userutil.MapBuilder
+
remove(Object) - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
removeAll() - Method in class com.mirth.connect.server.userutil.DestinationSet
+
+
Stop all destinations from being processed for this message.
+
+
removeAll(Collection) - Method in class com.mirth.connect.userutil.ListBuilder
+
removeAllExcept(Object) - Method in class com.mirth.connect.server.userutil.DestinationSet
+
+
Stop all except one destination from being processed for this message.
+
+
removeAllExcept(Collection<Object>) - Method in class com.mirth.connect.server.userutil.DestinationSet
+
+
Stop all except one destination from being processed for this message.
+
+
removeRowSetListener(RowSetListener) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
resetStatistics(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Reset all statistics for a specific channel.
+
+
resetStatistics(String, Integer) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Reset all statistics for the specified connector on the given channel.
+
+
resetStatistics(String, Integer, Collection<Status>) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Reset the specified statistics for the specified connector on the given channel.
+
+
Response - Class in com.mirth.connect.userutil
+
+
This class represents a channel or destination response and is used to retrieve details such as + the response data, message status, and errors.
+
+
Response() - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
Response(String) - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
Response(Status, String) - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
Response(Status, String, String) - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
Response(Status, String, String, String) - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
Response(Response) - Constructor for class com.mirth.connect.userutil.Response
+
+
Instantiates a new Response object.
+
+
ResponseFactory - Class in com.mirth.connect.server.userutil
+
+
Provides methods to create Response objects.
+
+
ResponseMap - Class in com.mirth.connect.userutil
+
+
A wrapper class for the response map which allows users to retrieve values using the proper "d#" + key (where "#" is the destination connector's metadata ID), or by using the actual destination + name.
+
+
ResponseMap(Map<String, Object>, Map<String, Integer>) - Constructor for class com.mirth.connect.userutil.ResponseMap
+
+
Instantiates a new ResponseMap object.
+
+
restoreOriginal() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
resumeChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Resume a deployed channel.
+
+
retainAll(Collection) - Method in class com.mirth.connect.userutil.ListBuilder
+
rollback() - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Undoes all changes made in the current transaction and releases any database locks currently + held by this Connection object.
+
+
rollback() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
rollback(Savepoint) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
routeMessage(String, String) - Method in class com.mirth.connect.server.userutil.VMRouter
+
+
Dispatches a message to a channel, specified by the deployed channel name.
+
+
routeMessage(String, RawMessage) - Method in class com.mirth.connect.server.userutil.VMRouter
+
+
Dispatches a message to a channel, specified by the deployed channel name.
+
+
routeMessageByChannelId(String, String) - Method in class com.mirth.connect.server.userutil.VMRouter
+
+
Dispatches a message to a channel, specified by the deployed channel ID.
+
+
routeMessageByChannelId(String, RawMessage) - Method in class com.mirth.connect.server.userutil.VMRouter
+
+
Dispatches a message to a channel, specified by the deployed channel ID.
+
+
rowDeleted() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
rowInserted() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
rowSetPopulated(RowSetEvent, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
rowUpdated() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
rtfToPlainText(String, String) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Converts an RTF into plain text using the Swing RTFEditorKit.
+
+
+ + + +

S

+
+
send(String, String, String, String, String, String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sends an e-mail message.
+
+
send(String, String, String, String, String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sends an e-mail message.
+
+
send(String, String, String, String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sends an e-mail message.
+
+
sendAlert(String) - Method in class com.mirth.connect.server.userutil.AlertSender
+
+
Dispatches an error event that can be alerted on.
+
+
SerializerFactory - Class in com.mirth.connect.server.userutil
+
+
Used to create a serializer for a specific data type for conversion to and from XML.
+
+
set(int, Object) - Method in class com.mirth.connect.userutil.ListBuilder
+
setArray(int, Array) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setAsciiStream(int, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setAsciiStream(String, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setAsciiStream(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setAsciiStream(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setAutoCommit(boolean) - Method in class com.mirth.connect.server.userutil.DatabaseConnection
+
+
Sets this connection's auto-commit mode to the given state.
+
+
setBigDecimal(int, BigDecimal) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBigDecimal(String, BigDecimal) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBinaryStream(int, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBinaryStream(String, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBinaryStream(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBinaryStream(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(int, Blob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(int, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(String, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(String, Blob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBlob(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBoolean(int, boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBoolean(String, boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setByte(int, byte) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setByte(String, byte) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBytes(int, byte[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setBytes(String, byte[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setChannelMap(Map<String, Object>) - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Deprecated. +
This method is deprecated and will soon be removed. Please use + setSourceMap(sourceMap) instead.
+
+
+
setCharacterStream(int, Reader, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setCharacterStream(String, Reader, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setCharacterStream(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setCharacterStream(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(int, Clob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(String, Clob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setClob(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setCommand(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setConcurrency(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setContent(byte[]) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Sets the content of the attachment.
+
+
setContent(String) - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Sets the content of the attachment entry.
+
+
setContentString(String) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Sets the content of the attachment, using UTF-8 encoding.
+
+
setContentString(String, String) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Sets the content of the attachment, using the specified charset encoding.
+
+
setDataSourceName(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDate(int, Date) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDate(int, Date, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDate(String, Date) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDate(String, Date, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDestinationMetaDataIds(Collection<Number>) - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Sets which destinations to dispatch the message to.
+
+
setDouble(int, double) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setDouble(String, double) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setError(String) - Method in class com.mirth.connect.userutil.Response
+
+
Sets the error string to be associated with this response.
+
+
setEscapeProcessing(boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setFetchDirection(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setFetchSize(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setFloat(int, float) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setFloat(String, float) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setFrom(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the FROM field to use for dispatched e-mail messages.
+
+
setHost(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the SMTP server address.
+
+
setId(String) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Sets the unique ID for the attachment.
+
+
setInt(int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setInt(String, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setKeyColumns(int[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setLong(int, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setLong(String, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMatchColumn(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMatchColumn(int[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMatchColumn(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMatchColumn(String[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMaxFieldSize(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMaxRows(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMessage(String) - Method in class com.mirth.connect.userutil.Response
+
+
Sets the response data.
+
+
setMetaData(RowSetMetaData) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setMimeType(String) - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Sets the MIME type of the attachment entry.
+
+
setName(String) - Method in class com.mirth.connect.userutil.AttachmentEntry
+
+
Sets the name of the attachment entry.
+
+
setNCharacterStream(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNCharacterStream(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNCharacterStream(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNCharacterStream(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(String, NClob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(int, NClob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNClob(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNString(int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNString(String, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNull(int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNull(String, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNull(int, int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setNull(String, int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(int, Object, int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(String, Object, int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(int, Object, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(String, Object, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(String, Object) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setObject(int, Object) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setOriginalRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setPageSize(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setPassword(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setPassword(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the password to use to authenticate to the SMTP server.
+
+
setPort(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the SMTP server port.
+
+
setQueryTimeout(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setReadOnly(boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setRealm(String) - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Sets the realm that the request has been authenticated with.
+
+
setRef(int, Ref) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setResponseHeaders(Map<String, List<String>>) - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Sets the map of HTTP headers to be sent along with the authentication response.
+
+
setRowId(int, RowId) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setRowId(String, RowId) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setSecure(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the encryption security layer to use for the SMTP connection.
+
+
setShort(int, short) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setShort(String, short) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setShowDeleted(boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setSocketTimeout(int) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the socket connection timeout value.
+
+
setSourceMap(Map<String, Object>) - Method in class com.mirth.connect.server.userutil.RawMessage
+
+
Sets the source map to be used at the beginning of the channel dispatch.
+
+
setSQLXML(int, SQLXML) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setSQLXML(String, SQLXML) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setStatus(AuthStatus) - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Sets the accept/reject status of the authentication attempt.
+
+
setStatus(Status) - Method in class com.mirth.connect.userutil.Response
+
+
Sets the status of this response.
+
+
setStatusMessage(String) - Method in class com.mirth.connect.userutil.Response
+
+
Sets the status message to use for this response.
+
+
setString(int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setString(String, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setSyncProvider(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTableName(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTime(int, Time) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTime(int, Time, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTime(String, Time) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTime(String, Time, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTimestamp(int, Timestamp) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTimestamp(String, Timestamp) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTimestamp(int, Timestamp, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTimestamp(String, Timestamp, Calendar) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTransactionIsolation(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setType(String) - Method in class com.mirth.connect.server.userutil.Attachment
+
+
Sets the MIME type for the attachment.
+
+
setType(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setTypeMap(Map<String, Class<?>>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setUrl(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setURL(int, URL) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setUseAuthentication(boolean) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets whether authentication is needed for the SMTP server.
+
+
setUsername(String) - Method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Sets the username that the request has been authenticated with.
+
+
setUsername(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
setUsername(String) - Method in class com.mirth.connect.server.userutil.SMTPConnection
+
+
Sets the username to use to authenticate to the SMTP server.
+
+
size() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
size() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
size() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
size() - Method in class com.mirth.connect.userutil.ListBuilder
+
size() - Method in class com.mirth.connect.userutil.MapBuilder
+
size() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
SMTPConnection - Class in com.mirth.connect.server.userutil
+
+
Used to send e-mail messages.
+
+
SMTPConnection(String, String, int, boolean, String, String, String, String) - Constructor for class com.mirth.connect.server.userutil.SMTPConnection
+
+
Instantiates an SMTP connection used to send e-mail messages with.
+
+
SMTPConnection(String, String, boolean, String, String, String, String) - Constructor for class com.mirth.connect.server.userutil.SMTPConnection
+
+
Instantiates an SMTP connection used to send e-mail messages with.
+
+
SMTPConnectionFactory - Class in com.mirth.connect.server.userutil
+
+
Utility class used to create SMTPConnection object using the server's default SMTP settings.
+
+
SourceMap - Class in com.mirth.connect.server.userutil
+
 
+
SourceMap(Map<String, Object>) - Constructor for class com.mirth.connect.server.userutil.SourceMap
+
+
Instantiates a new SourceMap object.
+
+
startChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Start a deployed channel.
+
+
startConnector(String, Integer) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Start a connector on a given channel.
+
+
Status - Enum in com.mirth.connect.userutil
+
+
Denotes the status of a connector message or response.
+
+
stopChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Stop a deployed channel.
+
+
stopConnector(String, Integer) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Stop a connector on a given channel.
+
+
subList(int, int) - Method in class com.mirth.connect.userutil.ListBuilder
+
Success() - Static method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Convenience method to create a new AuthenticationResult with the SUCCESS status.
+
+
Success(String, String) - Static method in class com.mirth.connect.plugins.httpauth.userutil.AuthenticationResult
+
+
Convenience method to create a new AuthenticationResult with the SUCCESS status.
+
+
+ + + +

T

+
+
toArray() - Method in class com.mirth.connect.userutil.ListBuilder
+
toArray(Object[]) - Method in class com.mirth.connect.userutil.ListBuilder
+
toCollection(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
toCollection() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
toCollection(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
toJson(String) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts an XML string to JSON, while stripping bound namespace prefixes.
+
+
toJson(String, boolean) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts an XML string to JSON.
+
+
toJson(String, boolean, boolean, boolean, boolean) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts an XML string to JSON.
+
+
toJson(String, boolean, boolean, boolean, boolean, boolean, boolean) - Static method in class com.mirth.connect.userutil.XmlUtil
+
+
Converts an XML string to JSON.
+
+
toString() - Method in enum com.mirth.connect.server.userutil.DeployedState
+
 
+
toString() - Method in enum com.mirth.connect.userutil.ContentType
+
 
+
toString() - Method in class com.mirth.connect.userutil.ImmutableConnectorMessage
+
toString() - Method in class com.mirth.connect.userutil.ImmutableMessage
+
toString() - Method in class com.mirth.connect.userutil.ListBuilder
+
toString() - Method in class com.mirth.connect.userutil.MapBuilder
+
toString() - Method in class com.mirth.connect.userutil.MessageHeaders
+
 
+
toString() - Method in class com.mirth.connect.userutil.MessageParameters
+
 
+
toString() - Method in class com.mirth.connect.userutil.Response
+
toXml(String) - Static method in class com.mirth.connect.userutil.JsonUtil
+
+
Converts a JSON string to XML.
+
+
toXml(String, boolean, boolean) - Static method in class com.mirth.connect.userutil.JsonUtil
+
+
Converts a JSON string to XML.
+
+
+ + + +

U

+
+
undeployChannel(String) - Static method in class com.mirth.connect.server.userutil.ChannelUtil
+
+
Undeploy a channel.
+
+
undoDelete() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
undoInsert() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
undoUpdate() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
unsetMatchColumn(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
unsetMatchColumn(int[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
unsetMatchColumn(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
unsetMatchColumn(String[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
unwrap(Class<T>) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateArray(String, Array) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateArray(int, Array) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(String, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(int, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(int, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(String, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAsciiStream(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateAttachment(ImmutableConnectorMessage, String, Object, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(ImmutableConnectorMessage, String, Object, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(ImmutableConnectorMessage, Attachment) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(ImmutableConnectorMessage, Attachment, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(String, Long, Attachment) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(String, Long, Attachment, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(String, Long, String, Object, String) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateAttachment(String, Long, String, Object, String, boolean) - Static method in class com.mirth.connect.server.userutil.AttachmentUtil
+
+
Updates an attachment associated with a given connector message.
+
+
updateBigDecimal(String, BigDecimal) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBigDecimal(int, BigDecimal) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(String, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(int, InputStream, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(int, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(String, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBinaryStream(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(String, Blob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(int, Blob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(int, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(String, InputStream, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(int, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBlob(String, InputStream) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBoolean(String, boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBoolean(int, boolean) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateByte(String, byte) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateByte(int, byte) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBytes(String, byte[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateBytes(int, byte[]) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(String, Reader, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(int, Reader, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateCharacterStream(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(String, Clob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(int, Clob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateClob(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateDate(String, Date) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateDate(int, Date) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateDouble(String, double) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateDouble(int, double) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateFloat(String, float) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateFloat(int, float) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateInt(String, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateInt(int, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateLong(String, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateLong(int, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNCharacterStream(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNCharacterStream(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNCharacterStream(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNCharacterStream(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(int, NClob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(String, NClob) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(int, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(String, Reader, long) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(int, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNClob(String, Reader) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNString(int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNString(String, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNull(String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateNull(int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateObject(String, Object, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateObject(String, Object) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateObject(int, Object, int) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateObject(int, Object) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateRef(String, Ref) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateRef(int, Ref) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateRow() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateRowId(int, RowId) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateRowId(String, RowId) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateShort(String, short) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateShort(int, short) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateSQLXML(int, SQLXML) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateSQLXML(String, SQLXML) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateString(String, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateString(int, String) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateTime(String, Time) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateTime(int, Time) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateTimestamp(String, Timestamp) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
updateTimestamp(int, Timestamp) - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
UUIDGenerator - Class in com.mirth.connect.server.userutil
+
+
Utility class to create unique identifiers.
+
+
+ + + +

V

+
+
valueOf(String) - Static method in enum com.mirth.connect.plugins.httpauth.userutil.AuthStatus
+
+
Returns the enum constant of this type with the specified name.
+
+
valueOf(String) - Static method in enum com.mirth.connect.server.userutil.DeployedState
+
+
Returns the enum constant of this type with the specified name.
+
+
valueOf(String) - Static method in enum com.mirth.connect.userutil.ContentType
+
+
Returns the enum constant of this type with the specified name.
+
+
valueOf(String) - Static method in enum com.mirth.connect.userutil.Status
+
+
Returns the enum constant of this type with the specified name.
+
+
values() - Static method in enum com.mirth.connect.plugins.httpauth.userutil.AuthStatus
+
+
Returns an array containing the constants of this enum type, in +the order they are declared.
+
+
values() - Method in class com.mirth.connect.server.userutil.ChannelMap
+
 
+
values() - Static method in enum com.mirth.connect.server.userutil.DeployedState
+
+
Returns an array containing the constants of this enum type, in +the order they are declared.
+
+
values() - Method in class com.mirth.connect.server.userutil.SourceMap
+
 
+
values() - Static method in enum com.mirth.connect.userutil.ContentType
+
+
Returns an array containing the constants of this enum type, in +the order they are declared.
+
+
values() - Method in class com.mirth.connect.userutil.MapBuilder
+
values() - Method in class com.mirth.connect.userutil.ResponseMap
+
 
+
values() - Static method in enum com.mirth.connect.userutil.Status
+
+
Returns an array containing the constants of this enum type, in +the order they are declared.
+
+
VMRouter - Class in com.mirth.connect.server.userutil
+
+
Utility class used to dispatch messages to channels.
+
+
VMRouter() - Constructor for class com.mirth.connect.server.userutil.VMRouter
+
+
Instantiates a VMRouter object.
+
+
+ + + +

W

+
+
wasNull() - Method in class com.mirth.connect.server.userutil.MirthCachedRowSet
+
 
+
write(String, boolean, String) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Writes a string to a specified file, creating the file if it does not exist.
+
+
write(String, boolean, byte[]) - Static method in class com.mirth.connect.server.userutil.FileUtil
+
+
Writes a byte array to a file, creating the file if it does not exist.
+
+
+ + + +

X

+
+
XmlUtil - Class in com.mirth.connect.userutil
+
+
Provides XML utility methods.
+
+
+A B C D E F G H I J K L M N P R S T U V W X 
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/index.html b/server/src/main/resources/docs/javadocs/user-api/index.html new file mode 100644 index 0000000000..14381252cd --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/index.html @@ -0,0 +1,75 @@ + + + + + +Generated Documentation (Untitled) + + + + + + + + + +<noscript> +<div>JavaScript is disabled on your browser.</div> +</noscript> +<h2>Frame Alert</h2> +<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p> + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/overview-frame.html b/server/src/main/resources/docs/javadocs/user-api/overview-frame.html new file mode 100644 index 0000000000..2c9c60ba9d --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/overview-frame.html @@ -0,0 +1,23 @@ + + + + + +Overview List + + + + + +
All Classes
+
+

Packages

+ +
+

 

+ + diff --git a/server/src/main/resources/docs/javadocs/user-api/overview-summary.html b/server/src/main/resources/docs/javadocs/user-api/overview-summary.html new file mode 100644 index 0000000000..5c8a574f0e --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/overview-summary.html @@ -0,0 +1,153 @@ + + + + + +Overview + + + + + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + +
Packages 
PackageDescription
com.mirth.connect.plugins.httpauth.userutil +
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
com.mirth.connect.server.userutil +
This package is included in the JavaScript scope on the server. Classes in this package are + part of the supported User API for use in channels/scripts. Reference to any class in Mirth + Connect outside of the userutil packages is unsupported.
+
com.mirth.connect.userutil +
This package is included in the JavaScript scope on both the client and the server. Classes + in this package are part of the supported User API for use in channels/scripts. Reference to + any class in Mirth Connect outside of the userutil packages is unsupported.
+
+
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/overview-tree.html b/server/src/main/resources/docs/javadocs/user-api/overview-tree.html new file mode 100644 index 0000000000..e5f1fe30e5 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/overview-tree.html @@ -0,0 +1,196 @@ + + + + + +Class Hierarchy + + + + + + + + +
+ + + + + + + +
+ + +
+

Hierarchy For All Packages

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +

Enum Hierarchy

+ +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/package-list b/server/src/main/resources/docs/javadocs/user-api/package-list new file mode 100644 index 0000000000..c0d2a5e86b --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/package-list @@ -0,0 +1,3 @@ +com.mirth.connect.plugins.httpauth.userutil +com.mirth.connect.server.userutil +com.mirth.connect.userutil diff --git a/server/src/main/resources/docs/javadocs/user-api/script.js b/server/src/main/resources/docs/javadocs/user-api/script.js new file mode 100644 index 0000000000..b346356931 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/script.js @@ -0,0 +1,30 @@ +function show(type) +{ + count = 0; + for (var key in methods) { + var row = document.getElementById(key); + if ((methods[key] & type) != 0) { + row.style.display = ''; + row.className = (count++ % 2) ? rowColor : altColor; + } + else + row.style.display = 'none'; + } + updateTabs(type); +} + +function updateTabs(type) +{ + for (var value in tabs) { + var sNode = document.getElementById(tabs[value][0]); + var spanNode = sNode.firstChild; + if (value == type) { + sNode.className = activeTableTab; + spanNode.innerHTML = tabs[value][1]; + } + else { + sNode.className = tableTab; + spanNode.innerHTML = "" + tabs[value][1] + ""; + } + } +} diff --git a/server/src/main/resources/docs/javadocs/user-api/serialized-form.html b/server/src/main/resources/docs/javadocs/user-api/serialized-form.html new file mode 100644 index 0000000000..322257f0a3 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/serialized-form.html @@ -0,0 +1,154 @@ + + + + + +Serialized Form + + + + + + + + +
+ + + + + + + +
+ + +
+

Serialized Form

+
+
+ +
+ +
+ + + + + + + +
+ + + + diff --git a/server/src/main/resources/docs/javadocs/user-api/stylesheet.css b/server/src/main/resources/docs/javadocs/user-api/stylesheet.css new file mode 100644 index 0000000000..98055b22d6 --- /dev/null +++ b/server/src/main/resources/docs/javadocs/user-api/stylesheet.css @@ -0,0 +1,574 @@ +/* Javadoc style sheet */ +/* +Overall document style +*/ + +@import url('resources/fonts/dejavu.css'); + +body { + background-color:#ffffff; + color:#353833; + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size:14px; + margin:0; +} +a:link, a:visited { + text-decoration:none; + color:#4A6782; +} +a:hover, a:focus { + text-decoration:none; + color:#bb7a2a; +} +a:active { + text-decoration:none; + color:#4A6782; +} +a[name] { + color:#353833; +} +a[name]:hover { + text-decoration:none; + color:#353833; +} +pre { + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; +} +h1 { + font-size:20px; +} +h2 { + font-size:18px; +} +h3 { + font-size:16px; + font-style:italic; +} +h4 { + font-size:13px; +} +h5 { + font-size:12px; +} +h6 { + font-size:11px; +} +ul { + list-style-type:disc; +} +code, tt { + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; + margin-top:8px; + line-height:1.4em; +} +dt code { + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; +} +table tr td dt code { + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + vertical-align:top; + padding-top:4px; +} +sup { + font-size:8px; +} +/* +Document title and Copyright styles +*/ +.clear { + clear:both; + height:0px; + overflow:hidden; +} +.aboutLanguage { + float:right; + padding:0px 21px; + font-size:11px; + z-index:200; + margin-top:-9px; +} +.legalCopy { + margin-left:.5em; +} +.bar a, .bar a:link, .bar a:visited, .bar a:active { + color:#FFFFFF; + text-decoration:none; +} +.bar a:hover, .bar a:focus { + color:#bb7a2a; +} +.tab { + background-color:#0066FF; + color:#ffffff; + padding:8px; + width:5em; + font-weight:bold; +} +/* +Navigation bar styles +*/ +.bar { + background-color:#4D7A97; + color:#FFFFFF; + padding:.8em .5em .4em .8em; + height:auto;/*height:1.8em;*/ + font-size:11px; + margin:0; +} +.topNav { + background-color:#4D7A97; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; + font-size:12px; +} +.bottomNav { + margin-top:10px; + background-color:#4D7A97; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; + font-size:12px; +} +.subNav { + background-color:#dee3e9; + float:left; + width:100%; + overflow:hidden; + font-size:12px; +} +.subNav div { + clear:left; + float:left; + padding:0 0 5px 6px; + text-transform:uppercase; +} +ul.navList, ul.subNavList { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.navList li{ + list-style:none; + float:left; + padding: 5px 6px; + text-transform:uppercase; +} +ul.subNavList li{ + list-style:none; + float:left; +} +.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { + color:#FFFFFF; + text-decoration:none; + text-transform:uppercase; +} +.topNav a:hover, .bottomNav a:hover { + text-decoration:none; + color:#bb7a2a; + text-transform:uppercase; +} +.navBarCell1Rev { + background-color:#F8981D; + color:#253441; + margin: auto 5px; +} +.skipNav { + position:absolute; + top:auto; + left:-9999px; + overflow:hidden; +} +/* +Page header and footer styles +*/ +.header, .footer { + clear:both; + margin:0 20px; + padding:5px 0 0 0; +} +.indexHeader { + margin:10px; + position:relative; +} +.indexHeader span{ + margin-right:15px; +} +.indexHeader h1 { + font-size:13px; +} +.title { + color:#2c4557; + margin:10px 0; +} +.subTitle { + margin:5px 0 0 0; +} +.header ul { + margin:0 0 15px 0; + padding:0; +} +.footer ul { + margin:20px 0 5px 0; +} +.header ul li, .footer ul li { + list-style:none; + font-size:13px; +} +/* +Heading styles +*/ +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { + background-color:#dee3e9; + border:1px solid #d0d9e0; + margin:0 0 6px -8px; + padding:7px 5px; +} +ul.blockList ul.blockList ul.blockList li.blockList h3 { + background-color:#dee3e9; + border:1px solid #d0d9e0; + margin:0 0 6px -8px; + padding:7px 5px; +} +ul.blockList ul.blockList li.blockList h3 { + padding:0; + margin:15px 0; +} +ul.blockList li.blockList h2 { + padding:0px 0 20px 0; +} +/* +Page layout container styles +*/ +.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + clear:both; + padding:10px 20px; + position:relative; +} +.indexContainer { + margin:10px; + position:relative; + font-size:12px; +} +.indexContainer h2 { + font-size:13px; + padding:0 0 3px 0; +} +.indexContainer ul { + margin:0; + padding:0; +} +.indexContainer ul li { + list-style:none; + padding-top:2px; +} +.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { + font-size:12px; + font-weight:bold; + margin:10px 0 0 0; + color:#4E4E4E; +} +.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { + margin:5px 0 10px 0px; + font-size:14px; + font-family:'DejaVu Sans Mono',monospace; +} +.serializedFormContainer dl.nameValue dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +.serializedFormContainer dl.nameValue dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* +List styles +*/ +ul.horizontal li { + display:inline; + font-size:0.9em; +} +ul.inheritance { + margin:0; + padding:0; +} +ul.inheritance li { + display:inline; + list-style:none; +} +ul.inheritance li ul.inheritance { + margin-left:15px; + padding-left:15px; + padding-top:1px; +} +ul.blockList, ul.blockListLast { + margin:10px 0 10px 0; + padding:0; +} +ul.blockList li.blockList, ul.blockListLast li.blockList { + list-style:none; + margin-bottom:15px; + line-height:1.4; +} +ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { + padding:0px 20px 5px 10px; + border:1px solid #ededed; + background-color:#f8f8f8; +} +ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { + padding:0 0 5px 8px; + background-color:#ffffff; + border:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { + margin-left:0; + padding-left:0; + padding-bottom:15px; + border:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { + list-style:none; + border-bottom:none; + padding-bottom:0; +} +table tr td dl, table tr td dl dt, table tr td dl dd { + margin-top:0; + margin-bottom:1px; +} +/* +Table styles +*/ +.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary { + width:100%; + border-left:1px solid #EEE; + border-right:1px solid #EEE; + border-bottom:1px solid #EEE; +} +.overviewSummary, .memberSummary { + padding:0px; +} +.overviewSummary caption, .memberSummary caption, .typeSummary caption, +.useSummary caption, .constantsSummary caption, .deprecatedSummary caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:#253441; + font-weight:bold; + clear:none; + overflow:hidden; + padding:0px; + padding-top:10px; + padding-left:1px; + margin:0px; + white-space:pre; +} +.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, +.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link, +.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, +.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, +.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, +.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, +.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, +.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited { + color:#FFFFFF; +} +.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, +.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:7px; + display:inline-block; + float:left; + background-color:#F8981D; + border: none; + height:16px; +} +.memberSummary caption span.activeTableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#F8981D; + height:16px; +} +.memberSummary caption span.tableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#4D7A97; + height:16px; +} +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { + padding-top:0px; + padding-left:0px; + padding-right:0px; + background-image:none; + float:none; + display:inline; +} +.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, +.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { + display:none; + width:5px; + position:relative; + float:left; + background-color:#F8981D; +} +.memberSummary .activeTableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + float:left; + background-color:#F8981D; +} +.memberSummary .tableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + background-color:#4D7A97; + float:left; + +} +.overviewSummary td, .memberSummary td, .typeSummary td, +.useSummary td, .constantsSummary td, .deprecatedSummary td { + text-align:left; + padding:0px 0px 12px 10px; +} +th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, +td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ + vertical-align:top; + padding-right:0px; + padding-top:8px; + padding-bottom:3px; +} +th.colFirst, th.colLast, th.colOne, .constantsSummary th { + background:#dee3e9; + text-align:left; + padding:8px 3px 3px 7px; +} +td.colFirst, th.colFirst { + white-space:nowrap; + font-size:13px; +} +td.colLast, th.colLast { + font-size:13px; +} +td.colOne, th.colOne { + font-size:13px; +} +.overviewSummary td.colFirst, .overviewSummary th.colFirst, +.useSummary td.colFirst, .useSummary th.colFirst, +.overviewSummary td.colOne, .overviewSummary th.colOne, +.memberSummary td.colFirst, .memberSummary th.colFirst, +.memberSummary td.colOne, .memberSummary th.colOne, +.typeSummary td.colFirst{ + width:25%; + vertical-align:top; +} +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; +} +.tableSubHeadingColor { + background-color:#EEEEFF; +} +.altColor { + background-color:#FFFFFF; +} +.rowColor { + background-color:#EEEEEF; +} +/* +Content styles +*/ +.description pre { + margin-top:0; +} +.deprecatedContent { + margin:0; + padding:10px 0; +} +.docSummary { + padding:0; +} + +ul.blockList ul.blockList ul.blockList li.blockList h3 { + font-style:normal; +} + +div.block { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; +} + +td.colLast div { + padding-top:0px; +} + + +td.colLast a { + padding-bottom:3px; +} +/* +Formatting effect styles +*/ +.sourceLineNo { + color:green; + padding:0 30px 0 0; +} +h1.hidden { + visibility:hidden; + overflow:hidden; + font-size:10px; +} +.block { + display:block; + margin:3px 10px 2px 0px; + color:#474747; +} +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { + font-weight:bold; +} +.deprecationComment, .emphasizedPhrase, .interfaceName { + font-style:italic; +} + +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, +div.block div.block span.interfaceName { + font-style:normal; +} + +div.contentContainer ul.blockList li.blockList h2{ + padding-bottom:0px; +} diff --git a/server/src/main/resources/docs/mcservice-java9+.vmoptions b/server/src/main/resources/docs/mcservice-java9+.vmoptions new file mode 100644 index 0000000000..811391868d --- /dev/null +++ b/server/src/main/resources/docs/mcservice-java9+.vmoptions @@ -0,0 +1,18 @@ +--add-modules=java.sql.rowset +--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED +--add-exports=java.base/sun.security.provider=ALL-UNNAMED +--add-opens=java.base/java.lang=ALL-UNNAMED +--add-opens=java.base/java.lang.reflect=ALL-UNNAMED +--add-opens=java.base/java.math=ALL-UNNAMED +--add-opens=java.base/java.net=ALL-UNNAMED +--add-opens=java.base/java.security=ALL-UNNAMED +--add-opens=java.base/java.security.cert=ALL-UNNAMED +--add-opens=java.base/java.text=ALL-UNNAMED +--add-opens=java.base/java.util=ALL-UNNAMED +--add-opens=java.base/sun.security.pkcs=ALL-UNNAMED +--add-opens=java.base/sun.security.rsa=ALL-UNNAMED +--add-opens=java.base/sun.security.x509=ALL-UNNAMED +--add-opens=java.desktop/java.awt=ALL-UNNAMED +--add-opens=java.desktop/java.awt.color=ALL-UNNAMED +--add-opens=java.desktop/java.awt.font=ALL-UNNAMED +--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED \ No newline at end of file diff --git a/server/docs/thirdparty/APACHE-LICENSE-2.0.txt b/server/src/main/resources/docs/thirdparty/APACHE-LICENSE-2.0.txt similarity index 100% rename from server/docs/thirdparty/APACHE-LICENSE-2.0.txt rename to server/src/main/resources/docs/thirdparty/APACHE-LICENSE-2.0.txt diff --git a/server/docs/thirdparty/ARTISTIC-LICENSE.txt b/server/src/main/resources/docs/thirdparty/ARTISTIC-LICENSE.txt similarity index 100% rename from server/docs/thirdparty/ARTISTIC-LICENSE.txt rename to server/src/main/resources/docs/thirdparty/ARTISTIC-LICENSE.txt diff --git a/server/docs/thirdparty/CC0-1.0.txt b/server/src/main/resources/docs/thirdparty/CC0-1.0.txt similarity index 100% rename from server/docs/thirdparty/CC0-1.0.txt rename to server/src/main/resources/docs/thirdparty/CC0-1.0.txt diff --git a/server/docs/thirdparty/CDDL-1.0.txt b/server/src/main/resources/docs/thirdparty/CDDL-1.0.txt similarity index 100% rename from server/docs/thirdparty/CDDL-1.0.txt rename to server/src/main/resources/docs/thirdparty/CDDL-1.0.txt diff --git a/server/docs/thirdparty/CDDL-1.1.txt b/server/src/main/resources/docs/thirdparty/CDDL-1.1.txt similarity index 100% rename from server/docs/thirdparty/CDDL-1.1.txt rename to server/src/main/resources/docs/thirdparty/CDDL-1.1.txt diff --git a/server/docs/thirdparty/CPL-1.0.txt b/server/src/main/resources/docs/thirdparty/CPL-1.0.txt similarity index 100% rename from server/docs/thirdparty/CPL-1.0.txt rename to server/src/main/resources/docs/thirdparty/CPL-1.0.txt diff --git a/server/docs/thirdparty/EPL-1.0.txt b/server/src/main/resources/docs/thirdparty/EPL-1.0.txt similarity index 100% rename from server/docs/thirdparty/EPL-1.0.txt rename to server/src/main/resources/docs/thirdparty/EPL-1.0.txt diff --git a/server/docs/thirdparty/EPL-2.0.txt b/server/src/main/resources/docs/thirdparty/EPL-2.0.txt similarity index 100% rename from server/docs/thirdparty/EPL-2.0.txt rename to server/src/main/resources/docs/thirdparty/EPL-2.0.txt diff --git a/server/docs/thirdparty/GPLv2+CE.txt b/server/src/main/resources/docs/thirdparty/GPLv2+CE.txt similarity index 100% rename from server/docs/thirdparty/GPLv2+CE.txt rename to server/src/main/resources/docs/thirdparty/GPLv2+CE.txt diff --git a/server/docs/thirdparty/LGPL-2.1.txt b/server/src/main/resources/docs/thirdparty/LGPL-2.1.txt similarity index 100% rename from server/docs/thirdparty/LGPL-2.1.txt rename to server/src/main/resources/docs/thirdparty/LGPL-2.1.txt diff --git a/server/docs/thirdparty/LGPL-3.0.txt b/server/src/main/resources/docs/thirdparty/LGPL-3.0.txt similarity index 100% rename from server/docs/thirdparty/LGPL-3.0.txt rename to server/src/main/resources/docs/thirdparty/LGPL-3.0.txt diff --git a/server/docs/thirdparty/MPL-1.1.txt b/server/src/main/resources/docs/thirdparty/MPL-1.1.txt similarity index 100% rename from server/docs/thirdparty/MPL-1.1.txt rename to server/src/main/resources/docs/thirdparty/MPL-1.1.txt diff --git a/server/docs/thirdparty/MPL-2.0.txt b/server/src/main/resources/docs/thirdparty/MPL-2.0.txt similarity index 100% rename from server/docs/thirdparty/MPL-2.0.txt rename to server/src/main/resources/docs/thirdparty/MPL-2.0.txt diff --git a/server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt b/server/src/main/resources/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt similarity index 100% rename from server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt rename to server/src/main/resources/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt diff --git a/server/docs/thirdparty/OSGi-1.0.txt b/server/src/main/resources/docs/thirdparty/OSGi-1.0.txt similarity index 100% rename from server/docs/thirdparty/OSGi-1.0.txt rename to server/src/main/resources/docs/thirdparty/OSGi-1.0.txt diff --git a/server/docs/thirdparty/THIRD-PARTY-README.txt b/server/src/main/resources/docs/thirdparty/THIRD-PARTY-README.txt similarity index 100% rename from server/docs/thirdparty/THIRD-PARTY-README.txt rename to server/src/main/resources/docs/thirdparty/THIRD-PARTY-README.txt diff --git a/server/keystore.jks b/server/src/main/resources/keystore.jks similarity index 100% rename from server/keystore.jks rename to server/src/main/resources/keystore.jks diff --git a/server/keystore.properties b/server/src/main/resources/keystore.properties similarity index 100% rename from server/keystore.properties rename to server/src/main/resources/keystore.properties diff --git a/server/mirth-client.jnlp b/server/src/main/resources/mirth-client.jnlp similarity index 100% rename from server/mirth-client.jnlp rename to server/src/main/resources/mirth-client.jnlp diff --git a/server/public_api_html/css/bootstrap-glyph.css b/server/src/main/resources/public_api_html/css/bootstrap-glyph.css similarity index 100% rename from server/public_api_html/css/bootstrap-glyph.css rename to server/src/main/resources/public_api_html/css/bootstrap-glyph.css diff --git a/server/public_api_html/css/mirth.css b/server/src/main/resources/public_api_html/css/mirth.css similarity index 100% rename from server/public_api_html/css/mirth.css rename to server/src/main/resources/public_api_html/css/mirth.css diff --git a/server/public_api_html/css/print.css b/server/src/main/resources/public_api_html/css/print.css similarity index 100% rename from server/public_api_html/css/print.css rename to server/src/main/resources/public_api_html/css/print.css diff --git a/server/public_api_html/css/reset.css b/server/src/main/resources/public_api_html/css/reset.css similarity index 100% rename from server/public_api_html/css/reset.css rename to server/src/main/resources/public_api_html/css/reset.css diff --git a/server/public_api_html/css/style.css b/server/src/main/resources/public_api_html/css/style.css similarity index 100% rename from server/public_api_html/css/style.css rename to server/src/main/resources/public_api_html/css/style.css diff --git a/server/public_api_html/css/swagger-ui.css b/server/src/main/resources/public_api_html/css/swagger-ui.css similarity index 100% rename from server/public_api_html/css/swagger-ui.css rename to server/src/main/resources/public_api_html/css/swagger-ui.css diff --git a/server/public_api_html/css/swagger-ui.css.map b/server/src/main/resources/public_api_html/css/swagger-ui.css.map similarity index 100% rename from server/public_api_html/css/swagger-ui.css.map rename to server/src/main/resources/public_api_html/css/swagger-ui.css.map diff --git a/server/public_api_html/css/typography.css b/server/src/main/resources/public_api_html/css/typography.css similarity index 100% rename from server/public_api_html/css/typography.css rename to server/src/main/resources/public_api_html/css/typography.css diff --git a/server/public_api_html/fonts/DroidSans-Bold.ttf b/server/src/main/resources/public_api_html/fonts/DroidSans-Bold.ttf similarity index 100% rename from server/public_api_html/fonts/DroidSans-Bold.ttf rename to server/src/main/resources/public_api_html/fonts/DroidSans-Bold.ttf diff --git a/server/public_api_html/fonts/DroidSans.ttf b/server/src/main/resources/public_api_html/fonts/DroidSans.ttf similarity index 100% rename from server/public_api_html/fonts/DroidSans.ttf rename to server/src/main/resources/public_api_html/fonts/DroidSans.ttf diff --git a/server/public_api_html/fonts/glyphicons-halflings-regular.eot b/server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from server/public_api_html/fonts/glyphicons-halflings-regular.eot rename to server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.eot diff --git a/server/public_api_html/fonts/glyphicons-halflings-regular.svg b/server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from server/public_api_html/fonts/glyphicons-halflings-regular.svg rename to server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.svg diff --git a/server/public_api_html/fonts/glyphicons-halflings-regular.ttf b/server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from server/public_api_html/fonts/glyphicons-halflings-regular.ttf rename to server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.ttf diff --git a/server/public_api_html/fonts/glyphicons-halflings-regular.woff b/server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from server/public_api_html/fonts/glyphicons-halflings-regular.woff rename to server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.woff diff --git a/server/public_api_html/fonts/glyphicons-halflings-regular.woff2 b/server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from server/public_api_html/fonts/glyphicons-halflings-regular.woff2 rename to server/src/main/resources/public_api_html/fonts/glyphicons-halflings-regular.woff2 diff --git a/server/public_api_html/images/MirthConnect_Logo_WordMark_Big.png b/server/src/main/resources/public_api_html/images/MirthConnect_Logo_WordMark_Big.png similarity index 100% rename from server/public_api_html/images/MirthConnect_Logo_WordMark_Big.png rename to server/src/main/resources/public_api_html/images/MirthConnect_Logo_WordMark_Big.png diff --git a/server/public_api_html/images/MirthConnect_Logo_WordMark_RGB.png b/server/src/main/resources/public_api_html/images/MirthConnect_Logo_WordMark_RGB.png similarity index 100% rename from server/public_api_html/images/MirthConnect_Logo_WordMark_RGB.png rename to server/src/main/resources/public_api_html/images/MirthConnect_Logo_WordMark_RGB.png diff --git a/server/public_api_html/images/NG_MC_Icon_16x16.png b/server/src/main/resources/public_api_html/images/NG_MC_Icon_16x16.png similarity index 100% rename from server/public_api_html/images/NG_MC_Icon_16x16.png rename to server/src/main/resources/public_api_html/images/NG_MC_Icon_16x16.png diff --git a/server/public_api_html/images/explorer_icons.png b/server/src/main/resources/public_api_html/images/explorer_icons.png similarity index 100% rename from server/public_api_html/images/explorer_icons.png rename to server/src/main/resources/public_api_html/images/explorer_icons.png diff --git a/server/public_api_html/images/throbber.gif b/server/src/main/resources/public_api_html/images/throbber.gif similarity index 100% rename from server/public_api_html/images/throbber.gif rename to server/src/main/resources/public_api_html/images/throbber.gif diff --git a/server/public_api_html/index.html b/server/src/main/resources/public_api_html/index.html similarity index 100% rename from server/public_api_html/index.html rename to server/src/main/resources/public_api_html/index.html diff --git a/server/public_api_html/lang/ca.js b/server/src/main/resources/public_api_html/lang/ca.js similarity index 100% rename from server/public_api_html/lang/ca.js rename to server/src/main/resources/public_api_html/lang/ca.js diff --git a/server/public_api_html/lang/el.js b/server/src/main/resources/public_api_html/lang/el.js similarity index 100% rename from server/public_api_html/lang/el.js rename to server/src/main/resources/public_api_html/lang/el.js diff --git a/server/public_api_html/lang/en.js b/server/src/main/resources/public_api_html/lang/en.js similarity index 100% rename from server/public_api_html/lang/en.js rename to server/src/main/resources/public_api_html/lang/en.js diff --git a/server/public_api_html/lang/es.js b/server/src/main/resources/public_api_html/lang/es.js similarity index 100% rename from server/public_api_html/lang/es.js rename to server/src/main/resources/public_api_html/lang/es.js diff --git a/server/public_api_html/lang/fr.js b/server/src/main/resources/public_api_html/lang/fr.js similarity index 100% rename from server/public_api_html/lang/fr.js rename to server/src/main/resources/public_api_html/lang/fr.js diff --git a/server/public_api_html/lang/geo.js b/server/src/main/resources/public_api_html/lang/geo.js similarity index 100% rename from server/public_api_html/lang/geo.js rename to server/src/main/resources/public_api_html/lang/geo.js diff --git a/server/public_api_html/lang/it.js b/server/src/main/resources/public_api_html/lang/it.js similarity index 100% rename from server/public_api_html/lang/it.js rename to server/src/main/resources/public_api_html/lang/it.js diff --git a/server/public_api_html/lang/ja.js b/server/src/main/resources/public_api_html/lang/ja.js similarity index 100% rename from server/public_api_html/lang/ja.js rename to server/src/main/resources/public_api_html/lang/ja.js diff --git a/server/public_api_html/lang/ko-kr.js b/server/src/main/resources/public_api_html/lang/ko-kr.js similarity index 100% rename from server/public_api_html/lang/ko-kr.js rename to server/src/main/resources/public_api_html/lang/ko-kr.js diff --git a/server/public_api_html/lang/pl.js b/server/src/main/resources/public_api_html/lang/pl.js similarity index 100% rename from server/public_api_html/lang/pl.js rename to server/src/main/resources/public_api_html/lang/pl.js diff --git a/server/public_api_html/lang/pt.js b/server/src/main/resources/public_api_html/lang/pt.js similarity index 100% rename from server/public_api_html/lang/pt.js rename to server/src/main/resources/public_api_html/lang/pt.js diff --git a/server/public_api_html/lang/ru.js b/server/src/main/resources/public_api_html/lang/ru.js similarity index 100% rename from server/public_api_html/lang/ru.js rename to server/src/main/resources/public_api_html/lang/ru.js diff --git a/server/public_api_html/lang/tr.js b/server/src/main/resources/public_api_html/lang/tr.js similarity index 100% rename from server/public_api_html/lang/tr.js rename to server/src/main/resources/public_api_html/lang/tr.js diff --git a/server/public_api_html/lang/translator.js b/server/src/main/resources/public_api_html/lang/translator.js similarity index 100% rename from server/public_api_html/lang/translator.js rename to server/src/main/resources/public_api_html/lang/translator.js diff --git a/server/public_api_html/lang/zh-cn.js b/server/src/main/resources/public_api_html/lang/zh-cn.js similarity index 100% rename from server/public_api_html/lang/zh-cn.js rename to server/src/main/resources/public_api_html/lang/zh-cn.js diff --git a/server/public_api_html/lib/backbone-min.js b/server/src/main/resources/public_api_html/lib/backbone-min.js similarity index 100% rename from server/public_api_html/lib/backbone-min.js rename to server/src/main/resources/public_api_html/lib/backbone-min.js diff --git a/server/public_api_html/lib/es5-shim.js b/server/src/main/resources/public_api_html/lib/es5-shim.js similarity index 100% rename from server/public_api_html/lib/es5-shim.js rename to server/src/main/resources/public_api_html/lib/es5-shim.js diff --git a/server/public_api_html/lib/handlebars-4.0.5.js b/server/src/main/resources/public_api_html/lib/handlebars-4.0.5.js similarity index 100% rename from server/public_api_html/lib/handlebars-4.0.5.js rename to server/src/main/resources/public_api_html/lib/handlebars-4.0.5.js diff --git a/server/public_api_html/lib/highlight.9.1.0.pack.js b/server/src/main/resources/public_api_html/lib/highlight.9.1.0.pack.js similarity index 100% rename from server/public_api_html/lib/highlight.9.1.0.pack.js rename to server/src/main/resources/public_api_html/lib/highlight.9.1.0.pack.js diff --git a/server/public_api_html/lib/highlight.9.1.0.pack_extended.js b/server/src/main/resources/public_api_html/lib/highlight.9.1.0.pack_extended.js similarity index 100% rename from server/public_api_html/lib/highlight.9.1.0.pack_extended.js rename to server/src/main/resources/public_api_html/lib/highlight.9.1.0.pack_extended.js diff --git a/server/public_api_html/lib/jquery-3.5.1.min.js b/server/src/main/resources/public_api_html/lib/jquery-3.5.1.min.js similarity index 100% rename from server/public_api_html/lib/jquery-3.5.1.min.js rename to server/src/main/resources/public_api_html/lib/jquery-3.5.1.min.js diff --git a/server/public_api_html/lib/jquery.ba-bbq.min.js b/server/src/main/resources/public_api_html/lib/jquery.ba-bbq.min.js similarity index 100% rename from server/public_api_html/lib/jquery.ba-bbq.min.js rename to server/src/main/resources/public_api_html/lib/jquery.ba-bbq.min.js diff --git a/server/public_api_html/lib/jquery.cookie.js b/server/src/main/resources/public_api_html/lib/jquery.cookie.js similarity index 100% rename from server/public_api_html/lib/jquery.cookie.js rename to server/src/main/resources/public_api_html/lib/jquery.cookie.js diff --git a/server/public_api_html/lib/jquery.slideto.min.js b/server/src/main/resources/public_api_html/lib/jquery.slideto.min.js similarity index 100% rename from server/public_api_html/lib/jquery.slideto.min.js rename to server/src/main/resources/public_api_html/lib/jquery.slideto.min.js diff --git a/server/public_api_html/lib/jquery.wiggle.min.js b/server/src/main/resources/public_api_html/lib/jquery.wiggle.min.js similarity index 100% rename from server/public_api_html/lib/jquery.wiggle.min.js rename to server/src/main/resources/public_api_html/lib/jquery.wiggle.min.js diff --git a/server/public_api_html/lib/js-yaml.min.js b/server/src/main/resources/public_api_html/lib/js-yaml.min.js similarity index 100% rename from server/public_api_html/lib/js-yaml.min.js rename to server/src/main/resources/public_api_html/lib/js-yaml.min.js diff --git a/server/public_api_html/lib/jsoneditor.min.js b/server/src/main/resources/public_api_html/lib/jsoneditor.min.js similarity index 100% rename from server/public_api_html/lib/jsoneditor.min.js rename to server/src/main/resources/public_api_html/lib/jsoneditor.min.js diff --git a/server/public_api_html/lib/lodash.min.js b/server/src/main/resources/public_api_html/lib/lodash.min.js similarity index 100% rename from server/public_api_html/lib/lodash.min.js rename to server/src/main/resources/public_api_html/lib/lodash.min.js diff --git a/server/public_api_html/lib/marked.js b/server/src/main/resources/public_api_html/lib/marked.js similarity index 100% rename from server/public_api_html/lib/marked.js rename to server/src/main/resources/public_api_html/lib/marked.js diff --git a/server/public_api_html/lib/object-assign-pollyfill.js b/server/src/main/resources/public_api_html/lib/object-assign-pollyfill.js similarity index 100% rename from server/public_api_html/lib/object-assign-pollyfill.js rename to server/src/main/resources/public_api_html/lib/object-assign-pollyfill.js diff --git a/server/public_api_html/lib/sanitize-html.min.js b/server/src/main/resources/public_api_html/lib/sanitize-html.min.js similarity index 100% rename from server/public_api_html/lib/sanitize-html.min.js rename to server/src/main/resources/public_api_html/lib/sanitize-html.min.js diff --git a/server/public_api_html/lib/swagger-ui-bundle.js b/server/src/main/resources/public_api_html/lib/swagger-ui-bundle.js similarity index 100% rename from server/public_api_html/lib/swagger-ui-bundle.js rename to server/src/main/resources/public_api_html/lib/swagger-ui-bundle.js diff --git a/server/public_api_html/lib/swagger-ui-bundle.js.map b/server/src/main/resources/public_api_html/lib/swagger-ui-bundle.js.map similarity index 100% rename from server/public_api_html/lib/swagger-ui-bundle.js.map rename to server/src/main/resources/public_api_html/lib/swagger-ui-bundle.js.map diff --git a/server/public_html/css/bootstrap.css b/server/src/main/resources/public_html/css/bootstrap.css similarity index 100% rename from server/public_html/css/bootstrap.css rename to server/src/main/resources/public_html/css/bootstrap.css diff --git a/server/public_html/css/main.css b/server/src/main/resources/public_html/css/main.css similarity index 100% rename from server/public_html/css/main.css rename to server/src/main/resources/public_html/css/main.css diff --git a/server/public_html/images/MirthConnect_Logo_WordMark_Big.png b/server/src/main/resources/public_html/images/MirthConnect_Logo_WordMark_Big.png similarity index 100% rename from server/public_html/images/MirthConnect_Logo_WordMark_Big.png rename to server/src/main/resources/public_html/images/MirthConnect_Logo_WordMark_Big.png diff --git a/server/public_html/images/MirthConnect_Logo_WordMark_white.png b/server/src/main/resources/public_html/images/MirthConnect_Logo_WordMark_white.png similarity index 100% rename from server/public_html/images/MirthConnect_Logo_WordMark_white.png rename to server/src/main/resources/public_html/images/MirthConnect_Logo_WordMark_white.png diff --git a/server/public_html/images/MirthConnect_NLogo_WM_RGB.png b/server/src/main/resources/public_html/images/MirthConnect_NLogo_WM_RGB.png similarity index 100% rename from server/public_html/images/MirthConnect_NLogo_WM_RGB.png rename to server/src/main/resources/public_html/images/MirthConnect_NLogo_WM_RGB.png diff --git a/server/public_html/images/NG_MC_Icon_128x128.png b/server/src/main/resources/public_html/images/NG_MC_Icon_128x128.png similarity index 100% rename from server/public_html/images/NG_MC_Icon_128x128.png rename to server/src/main/resources/public_html/images/NG_MC_Icon_128x128.png diff --git a/server/public_html/images/NG_MC_Icon_16x16.png b/server/src/main/resources/public_html/images/NG_MC_Icon_16x16.png similarity index 100% rename from server/public_html/images/NG_MC_Icon_16x16.png rename to server/src/main/resources/public_html/images/NG_MC_Icon_16x16.png diff --git a/server/public_html/images/NG_MC_Icon_32x32.png b/server/src/main/resources/public_html/images/NG_MC_Icon_32x32.png similarity index 100% rename from server/public_html/images/NG_MC_Icon_32x32.png rename to server/src/main/resources/public_html/images/NG_MC_Icon_32x32.png diff --git a/server/public_html/index.html b/server/src/main/resources/public_html/index.html similarity index 100% rename from server/public_html/index.html rename to server/src/main/resources/public_html/index.html diff --git a/server/public_html/js/jquery-3.5.1.min.js b/server/src/main/resources/public_html/js/jquery-3.5.1.min.js similarity index 100% rename from server/public_html/js/jquery-3.5.1.min.js rename to server/src/main/resources/public_html/js/jquery-3.5.1.min.js diff --git a/server/test/com/mirth/commons/encryption/test/DigesterTest.java b/server/src/test/java/com/mirth/commons/encryption/test/DigesterTest.java similarity index 100% rename from server/test/com/mirth/commons/encryption/test/DigesterTest.java rename to server/src/test/java/com/mirth/commons/encryption/test/DigesterTest.java diff --git a/server/test/com/mirth/commons/encryption/test/EncryptionTest.java b/server/src/test/java/com/mirth/commons/encryption/test/EncryptionTest.java similarity index 100% rename from server/test/com/mirth/commons/encryption/test/EncryptionTest.java rename to server/src/test/java/com/mirth/commons/encryption/test/EncryptionTest.java diff --git a/server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java b/server/src/test/java/com/mirth/commons/encryption/test/KeyEncryptorTest.java similarity index 100% rename from server/test/com/mirth/commons/encryption/test/KeyEncryptorTest.java rename to server/src/test/java/com/mirth/commons/encryption/test/KeyEncryptorTest.java diff --git a/server/test/com/mirth/connect/client/core/PropertiesConfigurationUtilTest.java b/server/src/test/java/com/mirth/connect/client/core/PropertiesConfigurationUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/client/core/PropertiesConfigurationUtilTest.java rename to server/src/test/java/com/mirth/connect/client/core/PropertiesConfigurationUtilTest.java diff --git a/server/test/com/mirth/connect/client/core/api/providers/JsonMessageBodyReaderTest.java b/server/src/test/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyReaderTest.java similarity index 100% rename from server/test/com/mirth/connect/client/core/api/providers/JsonMessageBodyReaderTest.java rename to server/src/test/java/com/mirth/connect/client/core/api/providers/JsonMessageBodyReaderTest.java diff --git a/server/test/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProviderTest.java b/server/src/test/java/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProviderTest.java similarity index 100% rename from server/test/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProviderTest.java rename to server/src/test/java/com/mirth/connect/client/core/api/providers/MetaDataSearchParamConverterProviderTest.java diff --git a/server/test/com/mirth/connect/connectors/ConnectorTests.java b/server/src/test/java/com/mirth/connect/connectors/ConnectorTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/ConnectorTests.java rename to server/src/test/java/com/mirth/connect/connectors/ConnectorTests.java diff --git a/server/test/com/mirth/connect/connectors/DummyChannel.java b/server/src/test/java/com/mirth/connect/connectors/DummyChannel.java similarity index 100% rename from server/test/com/mirth/connect/connectors/DummyChannel.java rename to server/src/test/java/com/mirth/connect/connectors/DummyChannel.java diff --git a/server/test/com/mirth/connect/connectors/StreamHandlerTests.java b/server/src/test/java/com/mirth/connect/connectors/StreamHandlerTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/StreamHandlerTests.java rename to server/src/test/java/com/mirth/connect/connectors/StreamHandlerTests.java diff --git a/server/test/com/mirth/connect/connectors/TestAutoResponder.java b/server/src/test/java/com/mirth/connect/connectors/TestAutoResponder.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestAutoResponder.java rename to server/src/test/java/com/mirth/connect/connectors/TestAutoResponder.java diff --git a/server/test/com/mirth/connect/connectors/TestConnectorProperties.java b/server/src/test/java/com/mirth/connect/connectors/TestConnectorProperties.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestConnectorProperties.java rename to server/src/test/java/com/mirth/connect/connectors/TestConnectorProperties.java diff --git a/server/test/com/mirth/connect/connectors/TestDestinationConnector.java b/server/src/test/java/com/mirth/connect/connectors/TestDestinationConnector.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestDestinationConnector.java rename to server/src/test/java/com/mirth/connect/connectors/TestDestinationConnector.java diff --git a/server/test/com/mirth/connect/connectors/TestResponseTransformer.java b/server/src/test/java/com/mirth/connect/connectors/TestResponseTransformer.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestResponseTransformer.java rename to server/src/test/java/com/mirth/connect/connectors/TestResponseTransformer.java diff --git a/server/test/com/mirth/connect/connectors/TestResponseValidator.java b/server/src/test/java/com/mirth/connect/connectors/TestResponseValidator.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestResponseValidator.java rename to server/src/test/java/com/mirth/connect/connectors/TestResponseValidator.java diff --git a/server/test/com/mirth/connect/connectors/TestSerializer.java b/server/src/test/java/com/mirth/connect/connectors/TestSerializer.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestSerializer.java rename to server/src/test/java/com/mirth/connect/connectors/TestSerializer.java diff --git a/server/test/com/mirth/connect/connectors/TestSourceConnector.java b/server/src/test/java/com/mirth/connect/connectors/TestSourceConnector.java similarity index 100% rename from server/test/com/mirth/connect/connectors/TestSourceConnector.java rename to server/src/test/java/com/mirth/connect/connectors/TestSourceConnector.java diff --git a/server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/dimse/DICOMDispatcherTest.java diff --git a/server/test/com/mirth/connect/connectors/file/FileDispatcherPropertiesTest.java b/server/src/test/java/com/mirth/connect/connectors/file/FileDispatcherPropertiesTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/FileDispatcherPropertiesTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/FileDispatcherPropertiesTest.java diff --git a/server/test/com/mirth/connect/connectors/file/FileReceiverPropertiesTest.java b/server/src/test/java/com/mirth/connect/connectors/file/FileReceiverPropertiesTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/FileReceiverPropertiesTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/FileReceiverPropertiesTest.java diff --git a/server/test/com/mirth/connect/connectors/file/FileReceiverTest.java b/server/src/test/java/com/mirth/connect/connectors/file/FileReceiverTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/FileReceiverTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/FileReceiverTest.java diff --git a/server/test/com/mirth/connect/connectors/file/filesystems/FileConnectionTests.java b/server/src/test/java/com/mirth/connect/connectors/file/filesystems/FileConnectionTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/filesystems/FileConnectionTests.java rename to server/src/test/java/com/mirth/connect/connectors/file/filesystems/FileConnectionTests.java diff --git a/server/test/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactoryTest.java b/server/src/test/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactoryTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactoryTest.java diff --git a/server/test/com/mirth/connect/connectors/file/filesystems/FtpConnectionTest.java b/server/src/test/java/com/mirth/connect/connectors/file/filesystems/FtpConnectionTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/filesystems/FtpConnectionTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/filesystems/FtpConnectionTest.java diff --git a/server/test/com/mirth/connect/connectors/file/filesystems/S3ConnectionTest.java b/server/src/test/java/com/mirth/connect/connectors/file/filesystems/S3ConnectionTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/filesystems/S3ConnectionTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/filesystems/S3ConnectionTest.java diff --git a/server/test/com/mirth/connect/connectors/file/filesystems/SmbFileConnectionTest.java b/server/src/test/java/com/mirth/connect/connectors/file/filesystems/SmbFileConnectionTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/file/filesystems/SmbFileConnectionTest.java rename to server/src/test/java/com/mirth/connect/connectors/file/filesystems/SmbFileConnectionTest.java diff --git a/server/test/com/mirth/connect/connectors/http/HttpDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/http/HttpDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/http/HttpDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/http/HttpDispatcherTest.java diff --git a/server/test/com/mirth/connect/connectors/http/HttpReceiverTest.java b/server/src/test/java/com/mirth/connect/connectors/http/HttpReceiverTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/http/HttpReceiverTest.java rename to server/src/test/java/com/mirth/connect/connectors/http/HttpReceiverTest.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScriptTest.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScriptTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScriptTest.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherScriptTest.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseDispatcherTests.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseDispatcherTests.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseDispatcherTests.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverInvalidColumnNameTests.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverInvalidColumnNameTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverInvalidColumnNameTests.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverInvalidColumnNameTests.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverScriptTest.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverScriptTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverScriptTest.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverScriptTest.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverTest.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverTest.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverTest.java diff --git a/server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverTests.java b/server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jdbc/DatabaseReceiverTests.java rename to server/src/test/java/com/mirth/connect/connectors/jdbc/DatabaseReceiverTests.java diff --git a/server/test/com/mirth/connect/connectors/jms/JmsDispatcherTests.java b/server/src/test/java/com/mirth/connect/connectors/jms/JmsDispatcherTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jms/JmsDispatcherTests.java rename to server/src/test/java/com/mirth/connect/connectors/jms/JmsDispatcherTests.java diff --git a/server/test/com/mirth/connect/connectors/jms/JmsReceiverTests.java b/server/src/test/java/com/mirth/connect/connectors/jms/JmsReceiverTests.java similarity index 100% rename from server/test/com/mirth/connect/connectors/jms/JmsReceiverTests.java rename to server/src/test/java/com/mirth/connect/connectors/jms/JmsReceiverTests.java diff --git a/server/test/com/mirth/connect/connectors/js/JavaScriptDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/js/JavaScriptDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/js/JavaScriptDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/js/JavaScriptDispatcherTest.java diff --git a/server/test/com/mirth/connect/connectors/js/JavaScriptReceiverTest.java b/server/src/test/java/com/mirth/connect/connectors/js/JavaScriptReceiverTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/js/JavaScriptReceiverTest.java rename to server/src/test/java/com/mirth/connect/connectors/js/JavaScriptReceiverTest.java diff --git a/server/test/com/mirth/connect/connectors/smtp/SmtpDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/smtp/SmtpDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/smtp/SmtpDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/smtp/SmtpDispatcherTest.java diff --git a/server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java diff --git a/server/test/com/mirth/connect/connectors/tcp/TcpReceiverTest.java b/server/src/test/java/com/mirth/connect/connectors/tcp/TcpReceiverTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/tcp/TcpReceiverTest.java rename to server/src/test/java/com/mirth/connect/connectors/tcp/TcpReceiverTest.java diff --git a/server/test/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java b/server/src/test/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java rename to server/src/test/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java diff --git a/server/test/com/mirth/connect/connectors/ws/WebServiceDispatcherTest.java b/server/src/test/java/com/mirth/connect/connectors/ws/WebServiceDispatcherTest.java similarity index 100% rename from server/test/com/mirth/connect/connectors/ws/WebServiceDispatcherTest.java rename to server/src/test/java/com/mirth/connect/connectors/ws/WebServiceDispatcherTest.java diff --git a/server/test/com/mirth/connect/donkey/server/data/jdbc/XmlQuerySourceTest.java b/server/src/test/java/com/mirth/connect/donkey/server/data/jdbc/XmlQuerySourceTest.java similarity index 100% rename from server/test/com/mirth/connect/donkey/server/data/jdbc/XmlQuerySourceTest.java rename to server/src/test/java/com/mirth/connect/donkey/server/data/jdbc/XmlQuerySourceTest.java diff --git a/server/test/com/mirth/connect/donkey/util/DonkeyElementTest.java b/server/src/test/java/com/mirth/connect/donkey/util/DonkeyElementTest.java similarity index 100% rename from server/test/com/mirth/connect/donkey/util/DonkeyElementTest.java rename to server/src/test/java/com/mirth/connect/donkey/util/DonkeyElementTest.java diff --git a/server/test/com/mirth/connect/model/ChannelPruningSettingsTest.java b/server/src/test/java/com/mirth/connect/model/ChannelPruningSettingsTest.java similarity index 100% rename from server/test/com/mirth/connect/model/ChannelPruningSettingsTest.java rename to server/src/test/java/com/mirth/connect/model/ChannelPruningSettingsTest.java diff --git a/server/test/com/mirth/connect/model/ChannelTest.java b/server/src/test/java/com/mirth/connect/model/ChannelTest.java similarity index 100% rename from server/test/com/mirth/connect/model/ChannelTest.java rename to server/src/test/java/com/mirth/connect/model/ChannelTest.java diff --git a/server/test/com/mirth/connect/model/DatabaseSettingsTest.java b/server/src/test/java/com/mirth/connect/model/DatabaseSettingsTest.java similarity index 100% rename from server/test/com/mirth/connect/model/DatabaseSettingsTest.java rename to server/src/test/java/com/mirth/connect/model/DatabaseSettingsTest.java diff --git a/server/test/com/mirth/connect/model/FilterTransformerElementTest.java b/server/src/test/java/com/mirth/connect/model/FilterTransformerElementTest.java similarity index 100% rename from server/test/com/mirth/connect/model/FilterTransformerElementTest.java rename to server/src/test/java/com/mirth/connect/model/FilterTransformerElementTest.java diff --git a/server/test/com/mirth/connect/model/FilterTransformerIterableTest.java b/server/src/test/java/com/mirth/connect/model/FilterTransformerIterableTest.java similarity index 100% rename from server/test/com/mirth/connect/model/FilterTransformerIterableTest.java rename to server/src/test/java/com/mirth/connect/model/FilterTransformerIterableTest.java diff --git a/server/test/com/mirth/connect/model/PublicServerSettingsTest.java b/server/src/test/java/com/mirth/connect/model/PublicServerSettingsTest.java similarity index 100% rename from server/test/com/mirth/connect/model/PublicServerSettingsTest.java rename to server/src/test/java/com/mirth/connect/model/PublicServerSettingsTest.java diff --git a/server/test/com/mirth/connect/model/ServerSettingsTest.java b/server/src/test/java/com/mirth/connect/model/ServerSettingsTest.java similarity index 100% rename from server/test/com/mirth/connect/model/ServerSettingsTest.java rename to server/src/test/java/com/mirth/connect/model/ServerSettingsTest.java diff --git a/server/test/com/mirth/connect/model/converters/DocumentSerailizerTests.java b/server/src/test/java/com/mirth/connect/model/converters/DocumentSerailizerTests.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/DocumentSerailizerTests.java rename to server/src/test/java/com/mirth/connect/model/converters/DocumentSerailizerTests.java diff --git a/server/test/com/mirth/connect/model/converters/DocumentSerializerTest.java b/server/src/test/java/com/mirth/connect/model/converters/DocumentSerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/DocumentSerializerTest.java rename to server/src/test/java/com/mirth/connect/model/converters/DocumentSerializerTest.java diff --git a/server/test/com/mirth/connect/model/converters/ObjectJSONSerializerTest.java b/server/src/test/java/com/mirth/connect/model/converters/ObjectJSONSerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/ObjectJSONSerializerTest.java rename to server/src/test/java/com/mirth/connect/model/converters/ObjectJSONSerializerTest.java diff --git a/server/test/com/mirth/connect/model/converters/ObjectXMLSerializerTest.java b/server/src/test/java/com/mirth/connect/model/converters/ObjectXMLSerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/ObjectXMLSerializerTest.java rename to server/src/test/java/com/mirth/connect/model/converters/ObjectXMLSerializerTest.java diff --git a/server/test/com/mirth/connect/model/converters/Stopwatch.java b/server/src/test/java/com/mirth/connect/model/converters/Stopwatch.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/Stopwatch.java rename to server/src/test/java/com/mirth/connect/model/converters/Stopwatch.java diff --git a/server/test/com/mirth/connect/model/converters/TestUtil.java b/server/src/test/java/com/mirth/connect/model/converters/TestUtil.java similarity index 100% rename from server/test/com/mirth/connect/model/converters/TestUtil.java rename to server/src/test/java/com/mirth/connect/model/converters/TestUtil.java diff --git a/server/test/com/mirth/connect/model/util/MigrationUtilTests.java b/server/src/test/java/com/mirth/connect/model/util/MigrationUtilTests.java similarity index 100% rename from server/test/com/mirth/connect/model/util/MigrationUtilTests.java rename to server/src/test/java/com/mirth/connect/model/util/MigrationUtilTests.java diff --git a/server/test/com/mirth/connect/plugins/datapruner/DataPrunerTests.java b/server/src/test/java/com/mirth/connect/plugins/datapruner/DataPrunerTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datapruner/DataPrunerTests.java rename to server/src/test/java/com/mirth/connect/plugins/datapruner/DataPrunerTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializerTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializerTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/delimited/DelimitedSerializerTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializerTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializerTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializerTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/dicom/DICOMSerializerTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/dicom/DICOMTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/dicom/DICOMTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/dicom/DICOMTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/dicom/DICOMTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDIBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/edi/EDISerializerTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDISerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/edi/EDISerializerTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDISerializerTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/edi/EDISerializerTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDISerializerTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/edi/EDISerializerTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/edi/EDISerializerTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/edi/X12Tests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/edi/X12Tests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/edi/X12Tests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/edi/X12Tests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/edi/X12Tests2.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/edi/X12Tests2.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/edi/X12Tests2.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/edi/X12Tests2.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7BatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/hl7v2/ER7SerializerTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7SerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/hl7v2/ER7SerializerTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/ER7SerializerTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/hl7v2/HL7SerializerTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7SerializerTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/hl7v2/HL7SerializerTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7SerializerTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/hl7v2/HL7Tests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7Tests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/hl7v2/HL7Tests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v2/HL7Tests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/hl7v3/HL7V3BatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/json/JSONBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPSerializerTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPTests.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPTests.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPTests.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/ncpdp/NCPDPTests.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/raw/RawBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactoryTest.java b/server/src/test/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactoryTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactoryTest.java rename to server/src/test/java/com/mirth/connect/plugins/datatypes/xml/XMLBatchAdaptorFactoryTest.java diff --git a/server/test/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStepTest.java b/server/src/test/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStepTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStepTest.java rename to server/src/test/java/com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStepTest.java diff --git a/server/test/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorTest.java b/server/src/test/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorTest.java rename to server/src/test/java/com/mirth/connect/plugins/httpauth/basic/BasicAuthenticatorTest.java diff --git a/server/test/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorTest.java b/server/src/test/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorTest.java similarity index 100% rename from server/test/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorTest.java rename to server/src/test/java/com/mirth/connect/plugins/httpauth/digest/DigestAuthenticatorTest.java diff --git a/server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java b/server/src/test/java/com/mirth/connect/server/DatabaseConnectionPoolTests.java similarity index 100% rename from server/test/com/mirth/connect/server/DatabaseConnectionPoolTests.java rename to server/src/test/java/com/mirth/connect/server/DatabaseConnectionPoolTests.java diff --git a/server/test/com/mirth/connect/server/JavaScriptFilterTransformerTest.java b/server/src/test/java/com/mirth/connect/server/JavaScriptFilterTransformerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/JavaScriptFilterTransformerTest.java rename to server/src/test/java/com/mirth/connect/server/JavaScriptFilterTransformerTest.java diff --git a/server/test/com/mirth/connect/server/TestFilterTransformer.java b/server/src/test/java/com/mirth/connect/server/TestFilterTransformer.java similarity index 100% rename from server/test/com/mirth/connect/server/TestFilterTransformer.java rename to server/src/test/java/com/mirth/connect/server/TestFilterTransformer.java diff --git a/server/test/com/mirth/connect/server/TestPreProcessor.java b/server/src/test/java/com/mirth/connect/server/TestPreProcessor.java similarity index 100% rename from server/test/com/mirth/connect/server/TestPreProcessor.java rename to server/src/test/java/com/mirth/connect/server/TestPreProcessor.java diff --git a/server/test/com/mirth/connect/server/TestUtils.java b/server/src/test/java/com/mirth/connect/server/TestUtils.java similarity index 100% rename from server/test/com/mirth/connect/server/TestUtils.java rename to server/src/test/java/com/mirth/connect/server/TestUtils.java diff --git a/server/test/com/mirth/connect/server/api/MirthServletTest.java b/server/src/test/java/com/mirth/connect/server/api/MirthServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/MirthServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/MirthServletTest.java diff --git a/server/test/com/mirth/connect/server/api/ServletTestBase.java b/server/src/test/java/com/mirth/connect/server/api/ServletTestBase.java similarity index 100% rename from server/test/com/mirth/connect/server/api/ServletTestBase.java rename to server/src/test/java/com/mirth/connect/server/api/ServletTestBase.java diff --git a/server/test/com/mirth/connect/server/api/providers/RequestedWithFilterTest.java b/server/src/test/java/com/mirth/connect/server/api/providers/RequestedWithFilterTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/providers/RequestedWithFilterTest.java rename to server/src/test/java/com/mirth/connect/server/api/providers/RequestedWithFilterTest.java diff --git a/server/test/com/mirth/connect/server/api/servlets/AlertServletTest.java b/server/src/test/java/com/mirth/connect/server/api/servlets/AlertServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/servlets/AlertServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/servlets/AlertServletTest.java diff --git a/server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java b/server/src/test/java/com/mirth/connect/server/api/servlets/ChannelServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/servlets/ChannelServletTest.java diff --git a/server/test/com/mirth/connect/server/api/servlets/ChannelStatusServletTest.java b/server/src/test/java/com/mirth/connect/server/api/servlets/ChannelStatusServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/servlets/ChannelStatusServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/servlets/ChannelStatusServletTest.java diff --git a/server/test/com/mirth/connect/server/api/servlets/EngineServletTest.java b/server/src/test/java/com/mirth/connect/server/api/servlets/EngineServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/servlets/EngineServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/servlets/EngineServletTest.java diff --git a/server/test/com/mirth/connect/server/api/servlets/MessageServletTest.java b/server/src/test/java/com/mirth/connect/server/api/servlets/MessageServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/api/servlets/MessageServletTest.java rename to server/src/test/java/com/mirth/connect/server/api/servlets/MessageServletTest.java diff --git a/server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java b/server/src/test/java/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java similarity index 100% rename from server/test/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java rename to server/src/test/java/com/mirth/connect/server/attachments/MirthAttachmentHandlerProviderTest.java diff --git a/server/test/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProviderTest.java b/server/src/test/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProviderTest.java similarity index 100% rename from server/test/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProviderTest.java rename to server/src/test/java/com/mirth/connect/server/attachments/javascript/JavaScriptAttachmentHandlerProviderTest.java diff --git a/server/test/com/mirth/connect/server/builders/JavaScriptBuilderTest.java b/server/src/test/java/com/mirth/connect/server/builders/JavaScriptBuilderTest.java similarity index 100% rename from server/test/com/mirth/connect/server/builders/JavaScriptBuilderTest.java rename to server/src/test/java/com/mirth/connect/server/builders/JavaScriptBuilderTest.java diff --git a/server/test/com/mirth/connect/server/controllers/Config 1.xml b/server/src/test/java/com/mirth/connect/server/controllers/Config 1.xml similarity index 100% rename from server/test/com/mirth/connect/server/controllers/Config 1.xml rename to server/src/test/java/com/mirth/connect/server/controllers/Config 1.xml diff --git a/server/test/com/mirth/connect/server/controllers/DebugUsageControllerTest.java b/server/src/test/java/com/mirth/connect/server/controllers/DebugUsageControllerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/DebugUsageControllerTest.java rename to server/src/test/java/com/mirth/connect/server/controllers/DebugUsageControllerTest.java diff --git a/server/test/com/mirth/connect/server/controllers/DefaultConfigurationControllerTest.java b/server/src/test/java/com/mirth/connect/server/controllers/DefaultConfigurationControllerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/DefaultConfigurationControllerTest.java rename to server/src/test/java/com/mirth/connect/server/controllers/DefaultConfigurationControllerTest.java diff --git a/server/test/com/mirth/connect/server/controllers/DefaultEventControllerTest.java b/server/src/test/java/com/mirth/connect/server/controllers/DefaultEventControllerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/DefaultEventControllerTest.java rename to server/src/test/java/com/mirth/connect/server/controllers/DefaultEventControllerTest.java diff --git a/server/test/com/mirth/connect/server/controllers/DefaultExtensionControllerTest.java b/server/src/test/java/com/mirth/connect/server/controllers/DefaultExtensionControllerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/DefaultExtensionControllerTest.java rename to server/src/test/java/com/mirth/connect/server/controllers/DefaultExtensionControllerTest.java diff --git a/server/test/com/mirth/connect/server/controllers/DonkeyEngineControllerTests.java b/server/src/test/java/com/mirth/connect/server/controllers/DonkeyEngineControllerTests.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/DonkeyEngineControllerTests.java rename to server/src/test/java/com/mirth/connect/server/controllers/DonkeyEngineControllerTests.java diff --git a/server/test/com/mirth/connect/server/controllers/MessageControllerTests.java b/server/src/test/java/com/mirth/connect/server/controllers/MessageControllerTests.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/MessageControllerTests.java rename to server/src/test/java/com/mirth/connect/server/controllers/MessageControllerTests.java diff --git a/server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java b/server/src/test/java/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java rename to server/src/test/java/com/mirth/connect/server/controllers/ServerConfigurationRestorerTest.java diff --git a/server/test/com/mirth/connect/server/controllers/TestFilterTransformer.java b/server/src/test/java/com/mirth/connect/server/controllers/TestFilterTransformer.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/TestFilterTransformer.java rename to server/src/test/java/com/mirth/connect/server/controllers/TestFilterTransformer.java diff --git a/server/test/com/mirth/connect/server/controllers/TestPostProcessor.java b/server/src/test/java/com/mirth/connect/server/controllers/TestPostProcessor.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/TestPostProcessor.java rename to server/src/test/java/com/mirth/connect/server/controllers/TestPostProcessor.java diff --git a/server/test/com/mirth/connect/server/controllers/TestPreProcessor.java b/server/src/test/java/com/mirth/connect/server/controllers/TestPreProcessor.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/TestPreProcessor.java rename to server/src/test/java/com/mirth/connect/server/controllers/TestPreProcessor.java diff --git a/server/test/com/mirth/connect/server/controllers/TestUtils.java b/server/src/test/java/com/mirth/connect/server/controllers/TestUtils.java similarity index 100% rename from server/test/com/mirth/connect/server/controllers/TestUtils.java rename to server/src/test/java/com/mirth/connect/server/controllers/TestUtils.java diff --git a/server/test/com/mirth/connect/server/migration/Migrate3_12_0Test.java b/server/src/test/java/com/mirth/connect/server/migration/Migrate3_12_0Test.java similarity index 100% rename from server/test/com/mirth/connect/server/migration/Migrate3_12_0Test.java rename to server/src/test/java/com/mirth/connect/server/migration/Migrate3_12_0Test.java diff --git a/server/test/com/mirth/connect/server/migration/Migrate3_7_0Test.java b/server/src/test/java/com/mirth/connect/server/migration/Migrate3_7_0Test.java similarity index 100% rename from server/test/com/mirth/connect/server/migration/Migrate3_7_0Test.java rename to server/src/test/java/com/mirth/connect/server/migration/Migrate3_7_0Test.java diff --git a/server/test/com/mirth/connect/server/migration/Migrate3_8_0Test.java b/server/src/test/java/com/mirth/connect/server/migration/Migrate3_8_0Test.java similarity index 100% rename from server/test/com/mirth/connect/server/migration/Migrate3_8_0Test.java rename to server/src/test/java/com/mirth/connect/server/migration/Migrate3_8_0Test.java diff --git a/server/test/com/mirth/connect/server/migration/Migrate4_0_0Test.java b/server/src/test/java/com/mirth/connect/server/migration/Migrate4_0_0Test.java similarity index 100% rename from server/test/com/mirth/connect/server/migration/Migrate4_0_0Test.java rename to server/src/test/java/com/mirth/connect/server/migration/Migrate4_0_0Test.java diff --git a/server/test/com/mirth/connect/server/migration/Migrate4_3_0Test.java b/server/src/test/java/com/mirth/connect/server/migration/Migrate4_3_0Test.java similarity index 100% rename from server/test/com/mirth/connect/server/migration/Migrate4_3_0Test.java rename to server/src/test/java/com/mirth/connect/server/migration/Migrate4_3_0Test.java diff --git a/server/test/com/mirth/connect/server/servlets/WebStartServletTest.java b/server/src/test/java/com/mirth/connect/server/servlets/WebStartServletTest.java similarity index 100% rename from server/test/com/mirth/connect/server/servlets/WebStartServletTest.java rename to server/src/test/java/com/mirth/connect/server/servlets/WebStartServletTest.java diff --git a/server/test/com/mirth/connect/server/transformers/JavaScriptResponseTransformerTest.java b/server/src/test/java/com/mirth/connect/server/transformers/JavaScriptResponseTransformerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/transformers/JavaScriptResponseTransformerTest.java rename to server/src/test/java/com/mirth/connect/server/transformers/JavaScriptResponseTransformerTest.java diff --git a/server/test/com/mirth/connect/server/util/LoginRequirementsCheckerTest.java b/server/src/test/java/com/mirth/connect/server/util/LoginRequirementsCheckerTest.java similarity index 100% rename from server/test/com/mirth/connect/server/util/LoginRequirementsCheckerTest.java rename to server/src/test/java/com/mirth/connect/server/util/LoginRequirementsCheckerTest.java diff --git a/server/test/com/mirth/connect/server/util/MapUtilTest.java b/server/src/test/java/com/mirth/connect/server/util/MapUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/server/util/MapUtilTest.java rename to server/src/test/java/com/mirth/connect/server/util/MapUtilTest.java diff --git a/server/test/com/mirth/connect/server/util/OAuthCredentialsTest.java b/server/src/test/java/com/mirth/connect/server/util/OAuthCredentialsTest.java similarity index 100% rename from server/test/com/mirth/connect/server/util/OAuthCredentialsTest.java rename to server/src/test/java/com/mirth/connect/server/util/OAuthCredentialsTest.java diff --git a/server/test/com/mirth/connect/server/util/PasswordRequirementsTests.java b/server/src/test/java/com/mirth/connect/server/util/PasswordRequirementsTests.java similarity index 100% rename from server/test/com/mirth/connect/server/util/PasswordRequirementsTests.java rename to server/src/test/java/com/mirth/connect/server/util/PasswordRequirementsTests.java diff --git a/server/test/com/mirth/connect/server/util/Pre22PasswordCheckerTests.java b/server/src/test/java/com/mirth/connect/server/util/Pre22PasswordCheckerTests.java similarity index 100% rename from server/test/com/mirth/connect/server/util/Pre22PasswordCheckerTests.java rename to server/src/test/java/com/mirth/connect/server/util/Pre22PasswordCheckerTests.java diff --git a/server/test/com/mirth/connect/server/util/TemplateValueReplacerTests.java b/server/src/test/java/com/mirth/connect/server/util/TemplateValueReplacerTests.java similarity index 100% rename from server/test/com/mirth/connect/server/util/TemplateValueReplacerTests.java rename to server/src/test/java/com/mirth/connect/server/util/TemplateValueReplacerTests.java diff --git a/server/test/com/mirth/connect/server/util/TestServer.java b/server/src/test/java/com/mirth/connect/server/util/TestServer.java similarity index 100% rename from server/test/com/mirth/connect/server/util/TestServer.java rename to server/src/test/java/com/mirth/connect/server/util/TestServer.java diff --git a/server/test/com/mirth/connect/userutil/HTTPUtilTest.java b/server/src/test/java/com/mirth/connect/userutil/HTTPUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/userutil/HTTPUtilTest.java rename to server/src/test/java/com/mirth/connect/userutil/HTTPUtilTest.java diff --git a/server/test/com/mirth/connect/userutil/HashUtilTest.java b/server/src/test/java/com/mirth/connect/userutil/HashUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/userutil/HashUtilTest.java rename to server/src/test/java/com/mirth/connect/userutil/HashUtilTest.java diff --git a/server/test/com/mirth/connect/userutil/JsonXmlUtilTest.java b/server/src/test/java/com/mirth/connect/userutil/JsonXmlUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/userutil/JsonXmlUtilTest.java rename to server/src/test/java/com/mirth/connect/userutil/JsonXmlUtilTest.java diff --git a/server/test/com/mirth/connect/util/ArchiveUtilsTest.java b/server/src/test/java/com/mirth/connect/util/ArchiveUtilsTest.java similarity index 100% rename from server/test/com/mirth/connect/util/ArchiveUtilsTest.java rename to server/src/test/java/com/mirth/connect/util/ArchiveUtilsTest.java diff --git a/server/test/com/mirth/connect/util/CodeTemplateUtilTest.java b/server/src/test/java/com/mirth/connect/util/CodeTemplateUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/util/CodeTemplateUtilTest.java rename to server/src/test/java/com/mirth/connect/util/CodeTemplateUtilTest.java diff --git a/server/test/com/mirth/connect/util/HttpUtilTest.java b/server/src/test/java/com/mirth/connect/util/HttpUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/util/HttpUtilTest.java rename to server/src/test/java/com/mirth/connect/util/HttpUtilTest.java diff --git a/server/test/com/mirth/connect/util/JavaScriptSharedUtilTest.java b/server/src/test/java/com/mirth/connect/util/JavaScriptSharedUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/util/JavaScriptSharedUtilTest.java rename to server/src/test/java/com/mirth/connect/util/JavaScriptSharedUtilTest.java diff --git a/server/test/com/mirth/connect/util/JavaScriptTestUtil.java b/server/src/test/java/com/mirth/connect/util/JavaScriptTestUtil.java similarity index 100% rename from server/test/com/mirth/connect/util/JavaScriptTestUtil.java rename to server/src/test/java/com/mirth/connect/util/JavaScriptTestUtil.java diff --git a/server/test/com/mirth/connect/util/JsonXmlUtilTest.java b/server/src/test/java/com/mirth/connect/util/JsonXmlUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/util/JsonXmlUtilTest.java rename to server/src/test/java/com/mirth/connect/util/JsonXmlUtilTest.java diff --git a/server/test/com/mirth/connect/util/MirthSSLUtilTest.java b/server/src/test/java/com/mirth/connect/util/MirthSSLUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/util/MirthSSLUtilTest.java rename to server/src/test/java/com/mirth/connect/util/MirthSSLUtilTest.java diff --git a/server/test/com/mirth/connect/util/MirthTestUtil.java b/server/src/test/java/com/mirth/connect/util/MirthTestUtil.java similarity index 100% rename from server/test/com/mirth/connect/util/MirthTestUtil.java rename to server/src/test/java/com/mirth/connect/util/MirthTestUtil.java diff --git a/server/test/com/mirth/connect/util/ValueReplacerTests.java b/server/src/test/java/com/mirth/connect/util/ValueReplacerTests.java similarity index 100% rename from server/test/com/mirth/connect/util/ValueReplacerTests.java rename to server/src/test/java/com/mirth/connect/util/ValueReplacerTests.java diff --git a/server/test/com/mirth/connect/util/VfsUtilsTest.java b/server/src/test/java/com/mirth/connect/util/VfsUtilsTest.java similarity index 100% rename from server/test/com/mirth/connect/util/VfsUtilsTest.java rename to server/src/test/java/com/mirth/connect/util/VfsUtilsTest.java diff --git a/server/test/com/mirth/connect/util/ZipTestUtils.java b/server/src/test/java/com/mirth/connect/util/ZipTestUtils.java similarity index 100% rename from server/test/com/mirth/connect/util/ZipTestUtils.java rename to server/src/test/java/com/mirth/connect/util/ZipTestUtils.java diff --git a/server/test/net/lingala/zip4j/unzip/UnzipEngineTest.java b/server/src/test/java/com/net/lingala/zip4j/unzip/UnzipEngineTest.java similarity index 100% rename from server/test/net/lingala/zip4j/unzip/UnzipEngineTest.java rename to server/src/test/java/com/net/lingala/zip4j/unzip/UnzipEngineTest.java diff --git a/server/test/net/lingala/zip4j/unzip/UnzipTest.java b/server/src/test/java/com/net/lingala/zip4j/unzip/UnzipTest.java similarity index 100% rename from server/test/net/lingala/zip4j/unzip/UnzipTest.java rename to server/src/test/java/com/net/lingala/zip4j/unzip/UnzipTest.java diff --git a/server/testlib/byte-buddy-1.8.8.jar b/server/testlib/byte-buddy-1.8.8.jar deleted file mode 100644 index 7b964f6055..0000000000 Binary files a/server/testlib/byte-buddy-1.8.8.jar and /dev/null differ diff --git a/server/testlib/byte-buddy-agent-1.8.8.jar b/server/testlib/byte-buddy-agent-1.8.8.jar deleted file mode 100644 index 1d32e2ef73..0000000000 Binary files a/server/testlib/byte-buddy-agent-1.8.8.jar and /dev/null differ diff --git a/server/testlib/junit-4.8.1.jar b/server/testlib/junit-4.8.1.jar deleted file mode 100644 index 524cd65ce5..0000000000 Binary files a/server/testlib/junit-4.8.1.jar and /dev/null differ diff --git a/server/testlib/mockito-core-2.7.9.jar b/server/testlib/mockito-core-2.7.9.jar deleted file mode 100644 index 926872f2ae..0000000000 Binary files a/server/testlib/mockito-core-2.7.9.jar and /dev/null differ diff --git a/server/testlib/objenesis-2.5.1.jar b/server/testlib/objenesis-2.5.1.jar deleted file mode 100644 index 31b245b99c..0000000000 Binary files a/server/testlib/objenesis-2.5.1.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..6fb346797d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,37 @@ +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) // Good practice + repositories { + gradlePluginPortal() + mavenCentral() + maven { + url = uri("https://maven.dcm4che.org/") + } + maven { + url = uri("https://repo.clojars.org/") + } + maven { + url = uri("https://maven.geotoolkit.org/") + } + maven { + url = uri("https://artifacts.camunda.com/artifactory/public/") + } + } +} + +rootProject.name = 'mirth-connect' + +include 'donkey' +include 'server' +include 'client' // Contains main Swing client UI +include 'command' +include 'manager' // Service manager UI +include 'webadmin'// Simple web UI +include 'generator'// HL7 Vocabulary Generator + +// 'simplesender' might be an example, include if part of the main build +// include 'simplesender' \ No newline at end of file diff --git a/simplesender/.classpath b/simplesender/.classpath deleted file mode 100644 index 0b61792e99..0000000000 --- a/simplesender/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/simplesender/.project b/simplesender/.project deleted file mode 100644 index 56981deb41..0000000000 --- a/simplesender/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - SimpleSender - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/webadmin/.classpath b/webadmin/.classpath deleted file mode 100644 index 79ab88054a..0000000000 --- a/webadmin/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webadmin/.project b/webadmin/.project deleted file mode 100644 index e449fab99f..0000000000 --- a/webadmin/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - WebAdmin - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/webadmin/build.gradle b/webadmin/build.gradle new file mode 100644 index 0000000000..de42a192ea --- /dev/null +++ b/webadmin/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'war' +} + +dependencies { + // --- Project Dependencies --- + implementation project(':donkey') // Assumes standard java-library publication + implementation project(':server') + + // --- Runtime Dependencies (from WEB-INF/lib) --- + // These will be packaged into WEB-INF/lib by the WAR plugin + implementation 'displaytag:displaytag:1.2' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'net.sourceforge.stripes:stripes:1.6.0' + + // --- Compile Time Only Dependencies --- + compileOnly 'javax.servlet:javax.servlet-api:3.1.0' + compileOnly 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3' + + // --- Test Dependencies --- (Inherited from root) +} + +// Configure the WAR plugin +war { + // Tell the plugin where the web app content is (instead of src/main/webapp) + from('WebContent') { + // Optional: configure includes/excludes if needed + } +} + +// Testing configuration (inherited from root) +tasks.named('test', Test) { + // Add specific test config for webadmin if needed +} + +// Build depends on WAR task +tasks.build.dependsOn(tasks.war) \ No newline at end of file diff --git a/webadmin/build.xml b/webadmin/build.xml deleted file mode 100644 index 2a3de7e594..0000000000 --- a/webadmin/build.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webadmin/src/com/mirth/connect/webadmin/action/BaseActionBean.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/BaseActionBean.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/BaseActionBean.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/BaseActionBean.java diff --git a/webadmin/src/com/mirth/connect/webadmin/action/BaseActionBeanContext.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/BaseActionBeanContext.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/BaseActionBeanContext.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/BaseActionBeanContext.java diff --git a/webadmin/src/com/mirth/connect/webadmin/action/DashboardStatisticsActionBean.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/DashboardStatisticsActionBean.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/DashboardStatisticsActionBean.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/DashboardStatisticsActionBean.java diff --git a/webadmin/src/com/mirth/connect/webadmin/action/IndexActionBean.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/IndexActionBean.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/IndexActionBean.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/IndexActionBean.java diff --git a/webadmin/src/com/mirth/connect/webadmin/action/LoginActionBean.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/LoginActionBean.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/LoginActionBean.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/LoginActionBean.java diff --git a/webadmin/src/com/mirth/connect/webadmin/action/LogoutActionBean.java b/webadmin/src/main/java/com/mirth/connect/webadmin/action/LogoutActionBean.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/action/LogoutActionBean.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/action/LogoutActionBean.java diff --git a/webadmin/src/com/mirth/connect/webadmin/utils/ChannelStatusDecorator.java b/webadmin/src/main/java/com/mirth/connect/webadmin/utils/ChannelStatusDecorator.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/utils/ChannelStatusDecorator.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/utils/ChannelStatusDecorator.java diff --git a/webadmin/src/com/mirth/connect/webadmin/utils/Constants.java b/webadmin/src/main/java/com/mirth/connect/webadmin/utils/Constants.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/utils/Constants.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/utils/Constants.java diff --git a/webadmin/src/com/mirth/connect/webadmin/utils/DateDecorator.java b/webadmin/src/main/java/com/mirth/connect/webadmin/utils/DateDecorator.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/utils/DateDecorator.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/utils/DateDecorator.java diff --git a/webadmin/src/com/mirth/connect/webadmin/utils/ErrorStatsDecorator.java b/webadmin/src/main/java/com/mirth/connect/webadmin/utils/ErrorStatsDecorator.java similarity index 100% rename from webadmin/src/com/mirth/connect/webadmin/utils/ErrorStatsDecorator.java rename to webadmin/src/main/java/com/mirth/connect/webadmin/utils/ErrorStatsDecorator.java