diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..1e727afd1f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,13 @@ +# Line-ending rules for files where endings are functional. +# (Pattern follows PR #214 by NicoPiel.) + +# Unix start scripts must stay LF +/gradlew text eol=lf +oieserver text eol=lf +configure-from-env text eol=lf + +# Windows scripts must stay CRLF +*.bat text eol=crlf + +# Binary files are left untouched +*.jar binary diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f968b4d704..98b202a02a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,15 +32,18 @@ jobs: java-package: 'jdk+fx' distribution: 'zulu' + - name: Set up Gradle + uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + with: + validate-wrappers: true + - name: Build OIE (signed) if: github.ref == 'refs/heads/main' - working-directory: server - run: ant -f mirth-build.xml + run: ./gradlew build - name: Build OIE (unsigned) if: github.ref != 'refs/heads/main' - working-directory: server - run: ant -f mirth-build.xml -DdisableSigning=true -Dcoverage=true + run: ./gradlew build -PdisableSigning=true -Pcoverage=true - name: Package distribution run: tar czf openintegrationengine.tar.gz -C server/ setup --transform 's|^setup|openintegrationengine/|' diff --git a/.gitignore b/.gitignore index 177a3d0a8d..787defcb62 100644 --- a/.gitignore +++ b/.gitignore @@ -178,7 +178,7 @@ donkey/donkey-test # /client/src/com/mirth/connect/client/ui/panels/reference/ # /client/src/com/mirth/connect/client/ui/util/ -/client/src/com/mirth/connect/client/ui/util/DocParser.java +/client/src/main/java/com/mirth/connect/client/ui/util/DocParser.java # /client/src/com/mirth/connect/connectors/ @@ -205,7 +205,7 @@ donkey/donkey-test # /client/src/com/mirth/connect/connectors/ws/ # /client/src/com/mirth/connect/plugins/ -/client/src/com/mirth/connect/plugins/sampledashboardcolumn +/client/src/main/java/com/mirth/connect/plugins/sampledashboardcolumn # /client/src/com/mirth/connect/plugins/dashboardstatus/ @@ -554,14 +554,14 @@ donkey/donkey-test # /server/src/com/mirth/connect/model/util/ # /server/src/com/mirth/connect/plugins/ -/server/src/com/mirth/connect/plugins/Graphical Mapper Transformer Step.xml -/server/src/com/mirth/connect/plugins/consoleconnectorstatus -/server/src/com/mirth/connect/plugins/Console Connector Status Monitor Plugin.xml -/server/src/com/mirth/connect/plugins/extendedhl7vocab -/server/src/com/mirth/connect/plugins/Extended HL7 Vocabulary.xml -/server/src/com/mirth/connect/plugins/Sample Dashboard Column Plugin.xml -/server/src/com/mirth/connect/plugins/ExtensionParser.xml -/server/src/com/mirth/connect/plugins/ExtensionRepositoryParser.java +/server/src/main/resources/com/mirth/connect/plugins/Graphical Mapper Transformer Step.xml +/server/src/main/java/com/mirth/connect/plugins/consoleconnectorstatus +/server/src/main/resources/com/mirth/connect/plugins/Console Connector Status Monitor Plugin.xml +/server/src/main/java/com/mirth/connect/plugins/extendedhl7vocab +/server/src/main/resources/com/mirth/connect/plugins/Extended HL7 Vocabulary.xml +/server/src/main/resources/com/mirth/connect/plugins/Sample Dashboard Column Plugin.xml +/server/src/main/resources/com/mirth/connect/plugins/ExtensionParser.xml +/server/src/main/java/com/mirth/connect/plugins/ExtensionRepositoryParser.java # /server/src/com/mirth/connect/plugins/dashboardstatus/ @@ -612,7 +612,7 @@ donkey/donkey-test # /server/src/com/mirth/connect/server/ # /server/src/com/mirth/connect/server/builders/ -/server/src/com/mirth/connect/server/builders/VocalEZParser.java +/server/src/main/java/com/mirth/connect/server/builders/VocalEZParser.java # /server/src/com/mirth/connect/server/controllers/ @@ -635,7 +635,7 @@ donkey/donkey-test # /server/src/com/mirth/connect/server/util/javascript/ # /server/src/com/mirth/connect/util/ -/server/src/com/mirth/connect/util/GenerateExtensionUpdate.java +/server/src/main/java/com/mirth/connect/util/GenerateExtensionUpdate.java # /server/src/org/ @@ -650,3 +650,6 @@ donkey/donkey-test # /server/src/org/mozilla/javascript/ # /server/src/org/mozilla/javascript/xmlimpl/ +server/setup.tar.gz +dependency-check-report.html +dependency-check-report.json diff --git a/.sdkmanrc b/.sdkmanrc index 1ef2f89fe4..7d78586f00 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,4 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below java=17.0.17.fx-zulu -ant=1.10.14 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4cfe9630b..17ec55d4ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,8 +26,45 @@ git checkout -b feature/your-feature-name ``` ### 5. Install Tooling -OIE specifies the working versions of Java and Ant in [.sdkmanrc](./.sdkmanrc). To take advantage of this, install [SDKMAN](https://sdkman.io/) and run `sdk env install` -in the project's root directory. +OIE specifies the working Java version in [.sdkmanrc](./.sdkmanrc). To take advantage of this, install [SDKMAN](https://sdkman.io/) and run `sdk env install` +in the project's root directory. No other tooling is required. + +### 5a. Build +The build is driven by Gradle through the included wrapper; no separate Gradle install is needed: +```bash +./gradlew build -PdisableSigning=true # full build without jar signing +./gradlew test # run the unit tests (-Pcoverage=true for JaCoCo) +./gradlew dist # build the distribution extension zips +``` +On Windows use `gradlew.bat` instead of `./gradlew`. The assembled distribution lands in `server/setup`, the same location the previous Ant build used. For release artifacts, run a clean build: `./gradlew clean build dist`. Windows with SDKMan may generate an error about the file path being too long in the javadoc step, skip this by adding `-x :server:userApiJavadoc` to your Gradle command. + +Dependencies are pinned and checksum-verified. To change a dependency version: edit `gradle/libs.versions.toml`, then refresh the checksum metadata **with a cold dependency cache and CI's flags**: +```bash +GRADLE_USER_HOME=$(mktemp -d) ./gradlew --write-verification-metadata sha256 build dist -PdisableSigning=true -Pcoverage=true +``` +The cold cache matters: a warm cache skips re-resolving already-cached parent POMs, so they never get recorded, and the build then fails verification only in CI (this bit us once during the migration). The run downloads everything once and takes a few minutes. Only when adding a **new** artifact that ships in the distribution does `gradle/vendored-layout.json` need a one-line placement entry, and the build fails with a message telling you so. + +### Changing build logic + +The build's correctness is guarded by output comparison, not by unit +tests of the build scripts. When you change build logic (staging, +packaging, jar definitions), confirm the change does not alter the +product: build `server/setup` before and after, and compare the two +trees. The [oie-build-parity](https://github.com/pacmano1/oie-build-parity) +tooling does this at the archive-entry level (and can reproduce the +original byte-identical comparison against the pre-Gradle Ant baseline). +Only the changes you intended should appear. + +### Run and debug + +```bash +./gradlew :server:createDerbyDb # one-time: create the embedded database +./gradlew :server:devRun # run the server from the development tree +./gradlew :server:devLauncher # run the server the way production starts it (from server/setup) +./gradlew :client:devClient # run the administrator client against https://localhost:8443 +``` + +Add `--debug-jvm` to any of these to suspend on JVM start and attach a debugger on port 5005. The JDK module flags come from `server/conf/default_modules.vmoptions`, the same file the production launcher uses. For IDEs, import the repository as a Gradle project (IntelliJ does this natively; Eclipse via Buildship); the old `.classpath`/`.project` files are gone on purpose. ### 6. Implement your changes diff --git a/Dockerfile b/Dockerfile index 29285cb0d3..4ed4782cd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM ubuntu:noble-20251013 AS builder WORKDIR /app # sdkman requires bash SHELL ["/bin/bash", "-c"] -ARG ANT_BUILD_ARGS="-DdisableSigning=true" +ARG GRADLE_BUILD_ARGS="-PdisableSigning=true" # Stage 1a: Install dependencies # Install necessary tools @@ -26,10 +26,12 @@ RUN apt-get update\ # Stage 1b: Build the application # Copy the entire source tree (excluding .dockerignore files), and build +# (file encoding is pinned to UTF-8 in gradle.properties) COPY . . -WORKDIR /app/server -RUN source "$HOME/.sdkman/bin/sdkman-init.sh" \ - && ANT_OPTS="-Dfile.encoding=UTF8" ant -f mirth-build.xml ${ANT_BUILD_ARGS} +RUN --mount=type=cache,target=/root/.gradle/caches,sharing=locked \ + --mount=type=cache,target=/root/.gradle/wrapper,sharing=locked \ + source "$HOME/.sdkman/bin/sdkman-init.sh" \ + && ./gradlew --no-daemon build ${GRADLE_BUILD_ARGS} ########################################## # diff --git a/README.md b/README.md index d5272e8c81..e70808b567 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ - [Why Open Integration Engine?](#why-open-integration-engine) - [Core Features](#core-features) - [Who It’s For](#who-its-for) +- [Building from Source](#building-from-source) - [Project Values](#project-values) - [Community and Governance](#community-and-governance) - [History and Roadmap](#history-and-roadmap) @@ -70,6 +71,19 @@ The **Open Integration Engine Project** is an open-source initiative committed t --- +## Building from Source + +The build is driven by Gradle through the committed wrapper; the only prerequisite is JDK 17 (see [.sdkmanrc](.sdkmanrc)): + +```bash +./gradlew build # full build + tests; distribution lands in server/setup +./gradlew clean build dist # release form, plus extension zips in server/dist +``` + +On Windows use `gradlew.bat`. See [CONTRIBUTING.md](CONTRIBUTING.md) for the full command reference, the dependency policy, and how to run the server for development. + +--- + ## Project Values - **Community-Driven Development** – Innovation through global collaboration diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..622069b107 --- /dev/null +++ b/build.gradle @@ -0,0 +1,343 @@ +/* + * Gradle build for the Open Integration Engine. + * + * Replaced the historical Ant build in June 2026 with verified output + * parity: server/setup is the assembled distribution, server/dist holds + * the extension zips, and every archive's entry contents were verified + * byte-identical against an Ant baseline (reproducible with the + * oie-build-parity tooling). The only + * differences are archive metadata: Gradle normalizes zip entry + * timestamps to its fixed epoch (the Ant build used archive.entry.date + * for the same purpose), orders entries deterministically, and does not + * write the Ant-Version manifest attribute. + * + * Dependencies resolve from Maven Central via gradle/libs.versions.toml; + * every coordinate was SHA-1 matched to the previously vendored jar, + * resolution is non-transitive so the artifact set stays exactly the + * audited set, and gradle/verification-metadata.xml enforces checksums + * on every resolution. The + * verifyVendoredParity task guards distribution placement + * (gradle/vendored-layout.json). Unmatched jars remain vendored in the + * module lib/ directories. + * + * Differences in full: no Ant-Version/Created-By manifest attributes, + * normalized entry timestamps and ordering, no timestamp comment in + * version.properties, one extra directory entry in mirth-client.jar + * and mirth-server.jar, and the empty package-info.class markers Ant's + * javac emitted for the three annotation-free package-info.java sources + * are not reproduced (inert, no runtime effect). + * + * Usage (build flags are Gradle project properties, -Pname=true): + * ./gradlew build full build + tests + * ./gradlew build -PdisableTests=true skip tests + * ./gradlew build -PdisableSigning=true skip jar signing + * ./gradlew test [-Pcoverage=true] tests only (JaCoCo optional) + * ./gradlew dist distribution extension zips + * ./gradlew clean clean all modules + * + * For release artifacts run a clean build (./gradlew clean build dist): + * the staging into server/setup removes stale files where it owns the + * directory, but artifacts renamed or removed from intermediate build + * directories are only guaranteed gone after a clean. + */ + +plugins { + // vulnerability scanning: ./gradlew dependencyCheckAggregate + // (replaces the old standalone dependency-check.xml Ant entry point) + id 'org.owasp.dependencycheck' version '12.2.2' +} + +dependencyCheck { + // NVD downloads are heavily throttled without a key; get one at + // https://nvd.nist.gov/developers/request-an-api-key + nvd { + apiKey = System.getenv('NVD_API_KEY') ?: '' + } + // the distribution ships no .NET assemblies, and the analyzer + // hard-fails the whole scan on machines without a dotnet runtime + analyzers { + assemblyEnabled = false + } + // also scan the jars that remain vendored (no Maven coordinates) + scanSet = subprojects.collect { it.file('lib') }.findAll { it.directory } +} + +// Build flags are passed as Gradle project properties: -Pname=true. +def flag = { String name -> + providers.gradleProperty(name).getOrNull() == 'true' +} + +ext { + disableTests = flag('disableTests') + disableSigning = flag('disableSigning') + coverageEnabled = flag('coverage') +} + +allprojects { + group = 'org.openintegrationengine' + // default comes from gradle.properties; -Pversion=x.y.z overrides + version = providers.gradleProperty('version').getOrNull() ?: version +} + +// Maps each Maven Central artifact ("group:artifact") to the directory +// its vendored copy lived in, so the staged distribution layout matches +// what the vendored build produced. Version-independent: bumping a +// version in libs.versions.toml needs no layout change; only a NEW +// distributed artifact needs a placement line (the build fails with a +// clear message if one is missing). +ext.vendoredLayout = file('gradle/vendored-layout.json').exists() + ? new groovy.json.JsonSlurper().parse(file('gradle/vendored-layout.json')) + : [:] + +// Maps a resolved-artifact inventory to {source File -> staged relative +// path} using the placement map. fileTree(lib) leftovers and project +// outputs are excluded naturally: they are not module components. +ext.placementsFor = { List inventory, String section, Closure dirFilter = { true } -> + def placements = rootProject.vendoredLayout[section] ?: [:] + def out = [:] + inventory.each { art -> + def entry = placements["${art.group}:${art.module}".toString()] + if (entry == null) { + return + } + // entry is either a directory string, or [dir:, file:] when the + // vendored copy carried a non-canonical file name (a version bump + // of such an artifact must revisit the pinned file name) + def dir = entry instanceof Map ? entry.dir : entry + if (!dirFilter(dir)) { + return + } + def name = entry instanceof Map ? entry.file : art.fileName + out[file(art.path)] = (dir ? "${dir}/" : '') + name + } + out +} + +// Lazily computes placements from a configuration RESOLVED IN THE CALLING +// PROJECT'S OWN CONTEXT. Never pass another project's configuration here +// (cross-project resolution is deprecated and fails in Gradle 9); consume +// the other project's placement manifest instead. +ext.stagedArtifacts = { configuration, String section, Closure dirFilter = { true } -> + def memo = null + return { + if (memo == null) { + def inventory = [] + configuration.incoming.artifacts.each { a -> + def id = a.id.componentIdentifier + if (id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier) { + inventory << [group: id.group, module: id.module, + fileName: a.file.name, path: a.file.absolutePath] + } + } + memo = rootProject.placementsFor(inventory, section, dirFilter) + } + memo + } +} + +// Reads the artifact inventory another project wrote with its own +// writeArtifactInventory task (the Gradle-9-safe replacement for +// resolving that project's configuration from here). +ext.stagedFromInventory = { File inventoryFile, String section, Closure dirFilter = { true } -> + def memo = null + return { + if (memo == null) { + def inventory = new groovy.json.JsonSlurper().parse(inventoryFile) + memo = rootProject.placementsFor(inventory, section, dirFilter) + } + memo + } +} + +subprojects { + apply plugin: 'java' + + repositories { + mavenCentral() + } + + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } + + // The dependency set must remain exactly the vendored jar set; the + // coordinates were derived from SHA-1 matches of the vendored jars, + // so transitive resolution would ADD artifacts the build never had. + // Revisit (enable transitivity, drop pins) as a deliberate follow-up. + ['compileClasspath', 'runtimeClasspath', 'testCompileClasspath', 'testRuntimeClasspath'].each { name -> + configurations.named(name) { transitive = false } + } + + dependencies { + // jars without a byte-identical Maven Central artifact stay vendored + implementation fileTree(dir: 'lib', include: '**/*.jar') + } + + tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + options.debug = true + } + // Match Ant's javac invocation: -sourcepath defaults to srcdir, and + // annotation processors are discovered on the compile classpath + // (Gradle would otherwise pass -proc:none, which also changes the + // parameter-name metadata javac records for anonymous classes). + compileJava { + options.sourcepath = sourceSets.main.java.sourceDirectories + options.annotationProcessorPath = configurations.compileClasspath + } + compileTestJava { + options.sourcepath = sourceSets.test.java.sourceDirectories + options.annotationProcessorPath = configurations.testCompileClasspath + } + + // The default java-plugin jar (build/libs/.jar) is not an OIE + // artifact; every real jar is declared explicitly per module. + tasks.named('jar') { enabled = false } + + tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + + // Gradle-9-safe cross-project artifact sharing: each project resolves + // its OWN runtime configuration and writes an inventory file; consumer + // projects read the file instead of resolving foreign configurations. + def inventoryFile = layout.buildDirectory.file('placement/artifacts.json') + tasks.register('writeArtifactInventory') { + description = 'Records this project\'s resolved runtime artifacts to build/placement/artifacts.json so ' + + ':server:stageSetup can place foreign-module jars without resolving their configurations cross-project (Gradle-9-safe).' + def cfg = configurations.runtimeClasspath + dependsOn cfg + outputs.file inventoryFile + outputs.upToDateWhen { false } + doLast { + def inventory = [] + cfg.incoming.artifacts.each { a -> + def id = a.id.componentIdentifier + if (id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier) { + inventory << [group: id.group, module: id.module, version: id.version, + fileName: a.file.name, path: a.file.absolutePath] + } + } + def f = inventoryFile.get().asFile + f.parentFile.mkdirs() + f.text = groovy.json.JsonOutput.toJson(inventory) + } + } + + tasks.register('verifyDistributionPlacement') { + description = 'Fails if any resolved runtime artifact lacks a distribution placement.' + def cfg = configurations.runtimeClasspath + dependsOn cfg + doLast { + def layoutMap = rootProject.vendoredLayout + def sections = (project.name in ['server', 'client']) ? [project.name, 'server-extensions'] : [project.name] + def missing = [] + int checked = 0 + cfg.incoming.artifacts.each { a -> + def id = a.id.componentIdentifier + if (!(id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier)) { + return + } + def ga = "${id.group}:${id.module}".toString() + if (sections.any { (layoutMap[it] ?: [:]).containsKey(ga) }) { + checked++ + } else { + missing << "${ga}:${id.version} (${a.file.name})" + } + } + logger.lifecycle "${project.name}: distribution placement verified for ${checked} artifacts" + if (!missing.isEmpty()) { + throw new GradleException('Resolved runtime artifacts with no entry in ' + + 'gradle/vendored-layout.json (they would be dropped from the staged ' + + 'distribution):\n ' + missing.unique().join('\n ')) + } + } + } + + tasks.withType(Test).configureEach { + onlyIf { !rootProject.disableTests } + useJUnit() + minHeapSize = '128m' + maxHeapSize = '2048m' + jvmArgs '-Xshare:off' + include '**/*Test.class' + } + + if (rootProject.coverageEnabled) { + apply plugin: 'jacoco' + jacoco { toolVersion = '0.8.8' } + tasks.withType(Test).configureEach { finalizedBy tasks.named('jacocoTestReport') } + tasks.named('jacocoTestReport') { + reports.xml.required = true + reports.html.required = true + } + } +} + +// --------------------------------------------------------------------- +// Top-level lifecycle, mirroring server/mirth-build.xml +// --------------------------------------------------------------------- + +// After the setup tree is assembled (and possibly signed), the Ant build +// copied the final extensions and client-lib back into server/build for +// downstream packaging (installers, CI artifacts). Untracked because the +// destinations overlap the extension build outputs. +def copyFinalArtifactsBack = tasks.register('copyFinalArtifactsBack') { + description = 'Copies the final (possibly signed) extensions and client-lib back into server/build.' + dependsOn ':server:createSetup' + outputs.upToDateWhen { false } + doLast { + sync { s -> + s.from 'server/setup/extensions' + s.into 'server/build/extensions' + } + sync { s -> + s.from 'server/setup/client-lib' + s.into 'server/build/client-lib' + } + } +} + +tasks.register('build') { + group = 'build' + description = 'Builds donkey, the server and its extensions, the client, and the CLI, then assembles server/setup.' + dependsOn ':donkey:assemble', ':command:assemble', ':server:createSetup', + copyFinalArtifactsBack, 'verifyVendoredParity' + if (!rootProject.disableTests) { + dependsOn ':donkey:test', ':server:test', ':client:test', ':command:test' + } +} + +tasks.register('dist') { + group = 'build' + description = 'Builds everything and creates the distribution extension zips in server/dist.' + dependsOn ':server:createExtensionZips' +} + +tasks.register('test') { + group = 'verification' + description = 'Runs the unit tests of every module (pass -Pcoverage=true for JaCoCo).' + dependsOn ':donkey:test', ':server:test', ':client:test', ':command:test' +} + +tasks.register('clean') { + group = 'build' + description = 'Cleans every module.' + dependsOn ':donkey:clean', ':server:clean', ':client:clean', ':command:clean', ':generator:clean' +} + +// Aggregate: the per-project checks resolve each configuration in its +// OWNING project's context (Gradle-9-safe; no cross-project resolution). +tasks.register('verifyVendoredParity') { + group = 'verification' + description = 'Verifies every resolved runtime artifact has a distribution placement ' + + '(checksums are enforced separately by gradle/verification-metadata.xml).' + dependsOn subprojects.collect { ":${it.name}:verifyDistributionPlacement" } +} + +// Note: the Ant build's append-license target was already broken at the +// time of the migration (no jar in the repository contains +// com.mirth.tools.header.HeaderTask), so it was not ported. diff --git a/client/.classpath b/client/.classpath deleted file mode 100644 index acbf60628b..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/Mirth Connect Client.launch b/client/Mirth Connect Client.launch deleted file mode 100644 index c546603ac4..0000000000 --- a/client/Mirth Connect Client.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/client/ant-build.xml b/client/ant-build.xml deleted file mode 100644 index e42fdf0f48..0000000000 --- a/client/ant-build.xml +++ /dev/null @@ -1,445 +0,0 @@ - - - - OIE Client Build Help - ----------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests WITH JaCoCo coverage. - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests. Coverage is only enabled if 'jacoco.agent.arg' is set. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/build.gradle b/client/build.gradle new file mode 100644 index 0000000000..4d62f6bd9d --- /dev/null +++ b/client/build.gradle @@ -0,0 +1,149 @@ +// The Swing administrator client. Produces dist/mirth-client.jar and the +// per-extension client jars in dist/extensions (mirrors client/ant-build.xml). + +dependencies { + implementation libs.bundles.client.main + // Extension libs from the server tree may carry client-side deps. + implementation libs.bundles.server.extensions + implementation fileTree(dir: rootProject.file('server/lib/extensions'), include: '**/*.jar') + testImplementation libs.bundles.server.test +} + +def prepareClientLibs = tasks.register('prepareClientLibs', Copy) { + description = 'Copies upstream jars into client/lib (mirrors mirth-build build-server-extensions/build-client).' + from rootProject.file('donkey/setup/donkey-model.jar') + from rootProject.file('server/setup/server-lib/mirth-client-core.jar') + from rootProject.file('server/setup/server-lib/mirth-crypto.jar') + from rootProject.file('server/lib/mirth-vocab.jar') + from(rootProject.file('server/build/extensions')) { + include '**/*-shared.jar' + eachFile { it.path = it.name } + includeEmptyDirs = false + } + into 'lib' + dependsOn ':donkey:donkeyModelJar', ':server:clientCoreJar', ':server:cryptoJar', + ':server:createServerExtensions' +} + +compileJava.dependsOn prepareClientLibs + +def clientJar = tasks.register('clientJar', Jar) { + archiveFileName = 'mirth-client.jar' + destinationDirectory = file('dist') + from(sourceSets.main.output.classesDirs) { + exclude 'com/mirth/connect/connectors/**' + } + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/connectors/ConnectorClass.class' + } + // Resources the Ant build copied into the classes dir before jarring. + from 'src/main/resources/log4j2.properties' + from('src/main/resources/com/mirth/connect/client/ui/images') { + into 'com/mirth/connect/client/ui/images' + } + from('src/main/resources/com/mirth/connect/client/ui/components/rsta') { + include '*.properties' + into 'com/mirth/connect/client/ui/components/rsta' + } + from('src/main/resources/com/mirth/connect/client/ui/components/tag') { + include '*.html' + include '*.css' + include '*.js' + into 'com/mirth/connect/client/ui/components/tag' + } +} + +// extension name -> package directory under the classes tree +def clientExtensions = [ + 'dicom' : 'com/mirth/connect/connectors/dimse', + 'jdbc' : 'com/mirth/connect/connectors/jdbc', + 'jms' : 'com/mirth/connect/connectors/jms', + 'http' : 'com/mirth/connect/connectors/http', + 'doc' : 'com/mirth/connect/connectors/doc', + 'smtp' : 'com/mirth/connect/connectors/smtp', + 'tcp' : 'com/mirth/connect/connectors/tcp', + 'file' : 'com/mirth/connect/connectors/file', + 'js' : 'com/mirth/connect/connectors/js', + 'ws' : 'com/mirth/connect/connectors/ws', + 'vm' : 'com/mirth/connect/connectors/vm', + 'datatype-delimited' : 'com/mirth/connect/plugins/datatypes/delimited', + 'datatype-dicom' : 'com/mirth/connect/plugins/datatypes/dicom', + 'datatype-edi' : 'com/mirth/connect/plugins/datatypes/edi', + 'datatype-hl7v2' : 'com/mirth/connect/plugins/datatypes/hl7v2', + 'datatype-hl7v3' : 'com/mirth/connect/plugins/datatypes/hl7v3', + 'datatype-ncpdp' : 'com/mirth/connect/plugins/datatypes/ncpdp', + 'datatype-xml' : 'com/mirth/connect/plugins/datatypes/xml', + 'datatype-raw' : 'com/mirth/connect/plugins/datatypes/raw', + 'datatype-json' : 'com/mirth/connect/plugins/datatypes/json', + 'directoryresource' : 'com/mirth/connect/plugins/directoryresource', + 'dashboardstatus' : 'com/mirth/connect/plugins/dashboardstatus', + 'destinationsetfilter': 'com/mirth/connect/plugins/destinationsetfilter', + 'dicomviewer' : 'com/mirth/connect/plugins/dicomviewer', + 'globalmapviewer' : 'com/mirth/connect/plugins/globalmapviewer', + 'httpauth' : 'com/mirth/connect/plugins/httpauth', + 'imageviewer' : 'com/mirth/connect/plugins/imageviewer', + 'javascriptrule' : 'com/mirth/connect/plugins/javascriptrule', + 'javascriptstep' : 'com/mirth/connect/plugins/javascriptstep', + 'mapper' : 'com/mirth/connect/plugins/mapper', + 'messagebuilder' : 'com/mirth/connect/plugins/messagebuilder', + 'datapruner' : 'com/mirth/connect/plugins/datapruner', + 'mllpmode' : 'com/mirth/connect/plugins/mllpmode', + 'pdfviewer' : 'com/mirth/connect/plugins/pdfviewer', + 'textviewer' : 'com/mirth/connect/plugins/textviewer', + 'rulebuilder' : 'com/mirth/connect/plugins/rulebuilder', + 'serverlog' : 'com/mirth/connect/plugins/serverlog', + 'scriptfilerule' : 'com/mirth/connect/plugins/scriptfilerule', + 'scriptfilestep' : 'com/mirth/connect/plugins/scriptfilestep', + 'xsltstep' : 'com/mirth/connect/plugins/xsltstep', +] + +def clientExtensionJars = clientExtensions.collect { name, pkg -> + tasks.register("ext_${name.replace('-', '_')}_clientJar", Jar) { + archiveFileName = "${name}-client.jar" + destinationDirectory = file("dist/extensions/${name}") + from(sourceSets.main.output.classesDirs) { + include "${pkg}/**" + } + } +} + +assemble.dependsOn clientJar +assemble.dependsOn clientExtensionJars + +// Runs the Swing administrator client against a local server (flags +// preserved from the retired Eclipse launch configuration). +tasks.register('devClient', JavaExec) { + description = 'Runs the administrator client against https://localhost:8443 (admin/admin).' + mainClass = 'com.mirth.connect.client.ui.Mirth' + workingDir = projectDir + classpath = sourceSets.main.runtimeClasspath + args 'https://localhost:8443', '0.0.0', 'admin', 'admin' + jvmArgs '-Dcom.sun.webkit.useHTTP2Loader=false', + '--add-modules=java.sql.rowset,javafx.controls,javafx.fxml', + '--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.io=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/java.util.concurrent=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/com.apple.eawt=ALL-UNNAMED', + '--add-opens=java.desktop/com.apple.eio=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.desktop/javax.swing=ALL-UNNAMED', + '--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED' +} + +clean { + delete 'classes', 'test_classes', 'dist', 'setup', 'logs' +} diff --git a/client/build.properties b/client/build.properties deleted file mode 100644 index 731c01e7a4..0000000000 --- a/client/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -# top level directories -src=${basedir}/src -test=${basedir}/test -build.dir=${basedir}/build -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 - -# Reports -reports.dir=${build.dir}/reports - -# JUnit Raw Results (XML) -test.results.dir=${build.dir}/test-results/test - -# JUnit Human-Readable Reports (HTML) -reports.tests.dir=${reports.dir}/tests/test - -# JaCoCo Execution Data (.exec) -jacoco.data.dir=${build.dir}/jacoco -jacoco.exec.file=${jacoco.data.dir}/test.exec - -# JaCoCo Reports (HTML and XML) -reports.jacoco.dir=${reports.dir}/jacoco/test -reports.jacoco.html=${reports.jacoco.dir}/html -reports.jacoco.xml=${reports.jacoco.dir}/jacocoTestReport.xml - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/client/lib/bcpkix-jdk18on-1.78.1.jar b/client/lib/bcpkix-jdk18on-1.78.1.jar deleted file mode 100644 index dca7170eeb..0000000000 Binary files a/client/lib/bcpkix-jdk18on-1.78.1.jar and /dev/null differ diff --git a/client/lib/bcprov-jdk18on-1.78.1.jar b/client/lib/bcprov-jdk18on-1.78.1.jar deleted file mode 100644 index 6726f83391..0000000000 Binary files a/client/lib/bcprov-jdk18on-1.78.1.jar and /dev/null differ diff --git a/client/lib/bcutil-jdk18on-1.78.1.jar b/client/lib/bcutil-jdk18on-1.78.1.jar deleted file mode 100644 index 348a2fff6d..0000000000 Binary files a/client/lib/bcutil-jdk18on-1.78.1.jar and /dev/null differ diff --git a/client/lib/commons-beanutils-1.11.0.jar b/client/lib/commons-beanutils-1.11.0.jar deleted file mode 100644 index 6b7b993661..0000000000 Binary files a/client/lib/commons-beanutils-1.11.0.jar and /dev/null differ diff --git a/client/lib/commons-codec-1.21.0.jar b/client/lib/commons-codec-1.21.0.jar deleted file mode 100644 index 99989eb59b..0000000000 Binary files a/client/lib/commons-codec-1.21.0.jar and /dev/null differ diff --git a/client/lib/commons-collections4-4.4.jar b/client/lib/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4ba..0000000000 Binary files a/client/lib/commons-collections4-4.4.jar and /dev/null differ diff --git a/client/lib/commons-compress-1.28.0.jar b/client/lib/commons-compress-1.28.0.jar deleted file mode 100644 index ff7e6aad05..0000000000 Binary files a/client/lib/commons-compress-1.28.0.jar and /dev/null differ diff --git a/client/lib/commons-configuration2-2.13.0.jar b/client/lib/commons-configuration2-2.13.0.jar deleted file mode 100644 index 1809bc354d..0000000000 Binary files a/client/lib/commons-configuration2-2.13.0.jar and /dev/null differ diff --git a/client/lib/commons-io-2.21.0.jar b/client/lib/commons-io-2.21.0.jar deleted file mode 100644 index 7f1688194e..0000000000 Binary files a/client/lib/commons-io-2.21.0.jar and /dev/null differ diff --git a/client/lib/commons-lang3-3.20.0.jar b/client/lib/commons-lang3-3.20.0.jar deleted file mode 100644 index 8682b86d3f..0000000000 Binary files a/client/lib/commons-lang3-3.20.0.jar and /dev/null differ diff --git a/client/lib/commons-logging-1.3.5.jar b/client/lib/commons-logging-1.3.5.jar deleted file mode 100644 index 75d93a15cf..0000000000 Binary files a/client/lib/commons-logging-1.3.5.jar and /dev/null differ diff --git a/client/lib/commons-pool2-2.3.jar b/client/lib/commons-pool2-2.3.jar deleted file mode 100644 index 5219e1cc23..0000000000 Binary files a/client/lib/commons-pool2-2.3.jar and /dev/null differ diff --git a/client/lib/commons-text-1.15.0.jar b/client/lib/commons-text-1.15.0.jar deleted file mode 100644 index 1ac427909f..0000000000 Binary files a/client/lib/commons-text-1.15.0.jar and /dev/null differ diff --git a/client/lib/commons-vfs2-2.10.0.jar b/client/lib/commons-vfs2-2.10.0.jar deleted file mode 100644 index cf5182ed13..0000000000 Binary files a/client/lib/commons-vfs2-2.10.0.jar and /dev/null differ diff --git a/client/lib/guava-32.0.1-jre.jar b/client/lib/guava-32.0.1-jre.jar deleted file mode 100644 index 5f3a1eee94..0000000000 Binary files a/client/lib/guava-32.0.1-jre.jar and /dev/null differ diff --git a/client/lib/hapi-structures-v27-2.3.jar b/client/lib/hapi-structures-v27-2.3.jar deleted file mode 100644 index c0c2ed5791..0000000000 Binary files a/client/lib/hapi-structures-v27-2.3.jar and /dev/null differ diff --git a/client/lib/hapi-structures-v28-2.3.jar b/client/lib/hapi-structures-v28-2.3.jar deleted file mode 100644 index 47d16f3486..0000000000 Binary files a/client/lib/hapi-structures-v28-2.3.jar and /dev/null differ diff --git a/client/lib/hapi-structures-v281-2.3.jar b/client/lib/hapi-structures-v281-2.3.jar deleted file mode 100644 index 85a21168f9..0000000000 Binary files a/client/lib/hapi-structures-v281-2.3.jar and /dev/null differ diff --git a/client/lib/hk2-api-2.4.0-b31.jar b/client/lib/hk2-api-2.4.0-b31.jar deleted file mode 100644 index 6a70ef3c18..0000000000 Binary files a/client/lib/hk2-api-2.4.0-b31.jar and /dev/null differ diff --git a/client/lib/hk2-locator-2.4.0-b31.jar b/client/lib/hk2-locator-2.4.0-b31.jar deleted file mode 100644 index 1f38d250d1..0000000000 Binary files a/client/lib/hk2-locator-2.4.0-b31.jar and /dev/null differ diff --git a/client/lib/hk2-utils-2.4.0-b31.jar b/client/lib/hk2-utils-2.4.0-b31.jar deleted file mode 100644 index 211ce37b11..0000000000 Binary files a/client/lib/hk2-utils-2.4.0-b31.jar and /dev/null differ diff --git a/client/lib/httpclient-4.5.13.jar b/client/lib/httpclient-4.5.13.jar deleted file mode 100644 index 218ee25f2b..0000000000 Binary files a/client/lib/httpclient-4.5.13.jar and /dev/null differ diff --git a/client/lib/httpcore-4.4.13.jar b/client/lib/httpcore-4.4.13.jar deleted file mode 100644 index 163dc438cb..0000000000 Binary files a/client/lib/httpcore-4.4.13.jar and /dev/null differ diff --git a/client/lib/httpmime-4.5.13.jar b/client/lib/httpmime-4.5.13.jar deleted file mode 100644 index cc52f44a3a..0000000000 Binary files a/client/lib/httpmime-4.5.13.jar and /dev/null differ diff --git a/client/lib/jackson-annotations-2.14.3.jar b/client/lib/jackson-annotations-2.14.3.jar deleted file mode 100644 index f10f7802de..0000000000 Binary files a/client/lib/jackson-annotations-2.14.3.jar and /dev/null differ diff --git a/client/lib/jackson-core-2.14.3.jar b/client/lib/jackson-core-2.14.3.jar deleted file mode 100644 index b1fb3f270e..0000000000 Binary files a/client/lib/jackson-core-2.14.3.jar and /dev/null differ diff --git a/client/lib/jackson-databind-2.14.3.jar b/client/lib/jackson-databind-2.14.3.jar deleted file mode 100644 index a4791e503d..0000000000 Binary files a/client/lib/jackson-databind-2.14.3.jar and /dev/null differ diff --git a/client/lib/jakarta.activation-1.2.1.jar b/client/lib/jakarta.activation-1.2.1.jar deleted file mode 100644 index fa6aad23af..0000000000 Binary files a/client/lib/jakarta.activation-1.2.1.jar and /dev/null differ diff --git a/client/lib/jakarta.mail-1.6.7.jar b/client/lib/jakarta.mail-1.6.7.jar deleted file mode 100644 index 2fbf85113a..0000000000 Binary files a/client/lib/jakarta.mail-1.6.7.jar and /dev/null differ diff --git a/client/lib/java-semver-0.10.2.jar b/client/lib/java-semver-0.10.2.jar deleted file mode 100644 index 875926e9ac..0000000000 Binary files a/client/lib/java-semver-0.10.2.jar and /dev/null differ diff --git a/client/lib/javassist-3.26.0-GA.jar b/client/lib/javassist-3.26.0-GA.jar deleted file mode 100644 index cb87f4a6a3..0000000000 Binary files a/client/lib/javassist-3.26.0-GA.jar and /dev/null differ diff --git a/client/lib/javax.activation-api-1.2.0.jar b/client/lib/javax.activation-api-1.2.0.jar deleted file mode 100644 index 986c365096..0000000000 Binary files a/client/lib/javax.activation-api-1.2.0.jar and /dev/null differ diff --git a/client/lib/javax.annotation-api-1.3.2.jar b/client/lib/javax.annotation-api-1.3.2.jar deleted file mode 100644 index a8a470a71a..0000000000 Binary files a/client/lib/javax.annotation-api-1.3.2.jar and /dev/null differ diff --git a/client/lib/javax.inject-2.4.0-b31.jar b/client/lib/javax.inject-2.4.0-b31.jar deleted file mode 100644 index 1f60d98a76..0000000000 Binary files a/client/lib/javax.inject-2.4.0-b31.jar and /dev/null differ diff --git a/client/lib/javax.ws.rs-api-2.0.1.jar b/client/lib/javax.ws.rs-api-2.0.1.jar deleted file mode 100644 index 7eb68b4a0a..0000000000 Binary files a/client/lib/javax.ws.rs-api-2.0.1.jar and /dev/null differ diff --git a/client/lib/jaxb-api-2.4.0-b180725.0427.jar b/client/lib/jaxb-api-2.4.0-b180725.0427.jar deleted file mode 100644 index 5dea8fef42..0000000000 Binary files a/client/lib/jaxb-api-2.4.0-b180725.0427.jar and /dev/null differ diff --git a/client/lib/jaxb-runtime-2.4.0-b180725.0644.jar b/client/lib/jaxb-runtime-2.4.0-b180725.0644.jar deleted file mode 100644 index 8ddbf7d6b7..0000000000 Binary files a/client/lib/jaxb-runtime-2.4.0-b180725.0644.jar and /dev/null differ diff --git a/client/lib/jcifs-ng-2.1.10.jar b/client/lib/jcifs-ng-2.1.10.jar deleted file mode 100644 index ae9a3463df..0000000000 Binary files a/client/lib/jcifs-ng-2.1.10.jar and /dev/null differ diff --git a/client/lib/jersey-client-2.22.1.jar b/client/lib/jersey-client-2.22.1.jar deleted file mode 100644 index 687843e168..0000000000 Binary files a/client/lib/jersey-client-2.22.1.jar and /dev/null differ diff --git a/client/lib/jersey-common-2.22.1.jar b/client/lib/jersey-common-2.22.1.jar deleted file mode 100644 index 9ee53873df..0000000000 Binary files a/client/lib/jersey-common-2.22.1.jar and /dev/null differ diff --git a/client/lib/jersey-guava-2.22.1.jar b/client/lib/jersey-guava-2.22.1.jar deleted file mode 100644 index 70f3a0761a..0000000000 Binary files a/client/lib/jersey-guava-2.22.1.jar and /dev/null differ diff --git a/client/lib/jersey-media-multipart-2.22.1.jar b/client/lib/jersey-media-multipart-2.22.1.jar deleted file mode 100644 index 6e7bc572a2..0000000000 Binary files a/client/lib/jersey-media-multipart-2.22.1.jar and /dev/null differ diff --git a/client/lib/jersey-proxy-client-2.22.1.jar b/client/lib/jersey-proxy-client-2.22.1.jar deleted file mode 100644 index c64e39ca7a..0000000000 Binary files a/client/lib/jersey-proxy-client-2.22.1.jar and /dev/null differ diff --git a/client/lib/jetty-util-9.4.57.v20241219.jar b/client/lib/jetty-util-9.4.57.v20241219.jar deleted file mode 100644 index caeda5de3e..0000000000 Binary files a/client/lib/jetty-util-9.4.57.v20241219.jar and /dev/null differ diff --git a/client/lib/joda-time-2.9.9.jar b/client/lib/joda-time-2.9.9.jar deleted file mode 100644 index b3080c4353..0000000000 Binary files a/client/lib/joda-time-2.9.9.jar and /dev/null differ diff --git a/client/lib/libphonenumber-8.12.50.jar b/client/lib/libphonenumber-8.12.50.jar deleted file mode 100644 index 28dcacc0f4..0000000000 Binary files a/client/lib/libphonenumber-8.12.50.jar and /dev/null differ diff --git a/client/lib/log4j-1.2-api-2.25.3.jar b/client/lib/log4j-1.2-api-2.25.3.jar deleted file mode 100644 index 680b5e1a8e..0000000000 Binary files a/client/lib/log4j-1.2-api-2.25.3.jar and /dev/null differ diff --git a/client/lib/log4j-api-2.25.3.jar b/client/lib/log4j-api-2.25.3.jar deleted file mode 100644 index 640998bb34..0000000000 Binary files a/client/lib/log4j-api-2.25.3.jar and /dev/null differ diff --git a/client/lib/log4j-core-2.25.3.jar b/client/lib/log4j-core-2.25.3.jar deleted file mode 100644 index a26e5b0164..0000000000 Binary files a/client/lib/log4j-core-2.25.3.jar and /dev/null differ diff --git a/client/lib/miglayout-core-4.2.jar b/client/lib/miglayout-core-4.2.jar deleted file mode 100644 index eff5670b4d..0000000000 Binary files a/client/lib/miglayout-core-4.2.jar and /dev/null differ diff --git a/client/lib/miglayout-swing-4.2.jar b/client/lib/miglayout-swing-4.2.jar deleted file mode 100644 index 25307d8e67..0000000000 Binary files a/client/lib/miglayout-swing-4.2.jar and /dev/null differ diff --git a/client/lib/mimepull-1.9.7.jar b/client/lib/mimepull-1.9.7.jar deleted file mode 100644 index 9fb1fd67b6..0000000000 Binary files a/client/lib/mimepull-1.9.7.jar and /dev/null differ diff --git a/client/lib/quartz-2.3.2.jar b/client/lib/quartz-2.3.2.jar deleted file mode 100644 index 8b7388287d..0000000000 Binary files a/client/lib/quartz-2.3.2.jar and /dev/null differ diff --git a/client/lib/reflections-0.9.10.jar b/client/lib/reflections-0.9.10.jar deleted file mode 100644 index c255641827..0000000000 Binary files a/client/lib/reflections-0.9.10.jar and /dev/null differ diff --git a/client/lib/regions-2.15.28.jar b/client/lib/regions-2.15.28.jar deleted file mode 100644 index 3ed0d0f66b..0000000000 Binary files a/client/lib/regions-2.15.28.jar and /dev/null differ diff --git a/client/lib/rhino-1.7.13.jar b/client/lib/rhino-1.7.13.jar deleted file mode 100644 index 6433ffc3e7..0000000000 Binary files a/client/lib/rhino-1.7.13.jar and /dev/null differ diff --git a/client/lib/slf4j-api-1.7.30.jar b/client/lib/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/client/lib/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/client/lib/slf4j-log4j12-1.7.30.jar b/client/lib/slf4j-log4j12-1.7.30.jar deleted file mode 100644 index c6bc8b2efe..0000000000 Binary files a/client/lib/slf4j-log4j12-1.7.30.jar and /dev/null differ diff --git a/client/lib/staxon-1.3.jar b/client/lib/staxon-1.3.jar deleted file mode 100644 index 7ba528985b..0000000000 Binary files a/client/lib/staxon-1.3.jar and /dev/null differ diff --git a/client/lib/swagger-annotations-2.0.10.jar b/client/lib/swagger-annotations-2.0.10.jar deleted file mode 100644 index cd67b28a2f..0000000000 Binary files a/client/lib/swagger-annotations-2.0.10.jar and /dev/null differ diff --git a/client/lib/swingx-core-1.6.2.jar b/client/lib/swingx-core-1.6.2.jar deleted file mode 100644 index 6ec269948b..0000000000 Binary files a/client/lib/swingx-core-1.6.2.jar and /dev/null differ diff --git a/client/lib/utils-2.15.28.jar b/client/lib/utils-2.15.28.jar deleted file mode 100644 index 6e97c99671..0000000000 Binary files a/client/lib/utils-2.15.28.jar and /dev/null differ diff --git a/client/lib/velocity-engine-core-2.3.jar b/client/lib/velocity-engine-core-2.3.jar deleted file mode 100644 index 879a7b4d51..0000000000 Binary files a/client/lib/velocity-engine-core-2.3.jar and /dev/null differ diff --git a/client/lib/velocity-tools-generic-3.1.jar b/client/lib/velocity-tools-generic-3.1.jar deleted file mode 100644 index 40afab6de8..0000000000 Binary files a/client/lib/velocity-tools-generic-3.1.jar and /dev/null differ diff --git a/client/lib/xpp3-1.1.4c.jar b/client/lib/xpp3-1.1.4c.jar deleted file mode 100644 index 451ac82af4..0000000000 Binary files a/client/lib/xpp3-1.1.4c.jar and /dev/null differ diff --git a/client/lib/xstream-1.4.20.jar b/client/lib/xstream-1.4.20.jar deleted file mode 100644 index a8f7cd8028..0000000000 Binary files a/client/lib/xstream-1.4.20.jar and /dev/null differ 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/BrandingConstants.java b/client/src/main/java/com/mirth/connect/client/ui/BrandingConstants.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/BrandingConstants.java rename to client/src/main/java/com/mirth/connect/client/ui/BrandingConstants.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/CommandLineOptions.java b/client/src/main/java/com/mirth/connect/client/ui/CommandLineOptions.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/CommandLineOptions.java rename to client/src/main/java/com/mirth/connect/client/ui/CommandLineOptions.java 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/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/FormatCodeAction.java b/client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FormatCodeAction.java similarity index 100% rename from client/src/com/mirth/connect/client/ui/components/rsta/actions/FormatCodeAction.java rename to client/src/main/java/com/mirth/connect/client/ui/components/rsta/actions/FormatCodeAction.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.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/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/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/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/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/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties b/client/src/main/resources/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/resources/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties diff --git a/client/src/com/mirth/connect/client/ui/components/tag/MirthTagField.html b/client/src/main/resources/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/resources/com/mirth/connect/client/ui/components/tag/MirthTagField.html diff --git a/client/src/com/mirth/connect/client/ui/components/tag/bootstrap-tokenfield.css b/client/src/main/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/com/mirth/connect/client/ui/components/tag/tokenfield-typeahead.css diff --git a/client/src/com/mirth/connect/client/ui/images/accept.png b/client/src/main/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/com/mirth/connect/client/ui/images/book_previous.png diff --git a/client/src/com/mirth/connect/client/ui/images/branding/oie_logo_banner_text_215x30.png b/client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_logo_banner_text_215x30.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/branding/oie_logo_banner_text_215x30.png rename to client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_logo_banner_text_215x30.png diff --git a/client/src/com/mirth/connect/client/ui/images/branding/oie_logo_only_white_background_32x32.png b/client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_logo_only_white_background_32x32.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/branding/oie_logo_only_white_background_32x32.png rename to client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_logo_only_white_background_32x32.png diff --git a/client/src/com/mirth/connect/client/ui/images/branding/oie_white_logo_banner_text_215x30.png b/client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_white_logo_banner_text_215x30.png similarity index 100% rename from client/src/com/mirth/connect/client/ui/images/branding/oie_white_logo_banner_text_215x30.png rename to client/src/main/resources/com/mirth/connect/client/ui/images/branding/oie_white_logo_banner_text_215x30.png diff --git a/client/src/com/mirth/connect/client/ui/images/bug.png b/client/src/main/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/com/mirth/connect/client/ui/images/wrench.png diff --git a/client/src/log4j2.properties b/client/src/main/resources/log4j2.properties similarity index 100% rename from client/src/log4j2.properties rename to client/src/main/resources/log4j2.properties diff --git a/client/test/com/mirth/connect/client/ui/CommandLineOptionsTest.java b/client/src/test/java/com/mirth/connect/client/ui/CommandLineOptionsTest.java similarity index 100% rename from client/test/com/mirth/connect/client/ui/CommandLineOptionsTest.java rename to client/src/test/java/com/mirth/connect/client/ui/CommandLineOptionsTest.java diff --git a/client/test/com/mirth/connect/client/ui/UserEditPanelTest.java b/client/src/test/java/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/java/com/mirth/connect/client/ui/UserEditPanelTest.java diff --git a/client/test/com/mirth/connect/client/ui/editors/IteratorUtilTest.java b/client/src/test/java/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/java/com/mirth/connect/client/ui/editors/IteratorUtilTest.java diff --git a/command/.classpath b/command/.classpath deleted file mode 100644 index 18265d3d5d..0000000000 --- a/command/.classpath +++ /dev/null @@ -1,89 +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/Mirth Connect CLI.launch b/command/Mirth Connect CLI.launch deleted file mode 100644 index 19eed61050..0000000000 --- a/command/Mirth Connect CLI.launch +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/command/build.gradle b/command/build.gradle new file mode 100644 index 0000000000..a4b278de95 --- /dev/null +++ b/command/build.gradle @@ -0,0 +1,81 @@ +// The CLI module. Produces mirth-cli.jar and mirth-cli-launcher.jar in +// command/build, plus the conf and cli-lib staging directories +// (mirrors command/build.xml). + +// The Ant classpath was lib/*.jar (flat, not recursive). +dependencies { + implementation libs.bundles.command.main + implementation fileTree(dir: 'lib', include: '*.jar') + testImplementation libs.bundles.command.test +} + +def prepareCliLibs = tasks.register('prepareCliLibs', Copy) { + description = 'Copies donkey/server jars into command/lib (mirrors mirth-build build-cli).' + from rootProject.file('donkey/setup/donkey-model.jar') + from rootProject.file('server/setup/server-lib/mirth-client-core.jar') + from rootProject.file('server/setup/server-lib/mirth-crypto.jar') + into 'lib' + dependsOn ':donkey:donkeyModelJar', ':server:clientCoreJar', ':server:cryptoJar' +} + +compileJava.dependsOn prepareCliLibs + +def cliJar = tasks.register('cliJar', Jar) { + archiveFileName = 'mirth-cli.jar' + destinationDirectory = layout.buildDirectory + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/cli/**' + exclude 'com/mirth/connect/cli/launcher/**' + } +} + +def cliLauncherJar = tasks.register('cliLauncherJar', Jar) { + archiveFileName = 'mirth-cli-launcher.jar' + destinationDirectory = layout.buildDirectory + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/cli/launcher/**' + } + manifest { + attributes('Main-Class': 'com.mirth.connect.cli.launcher.CommandLineLauncher') + } + // Generated from resolved versions; see the server launcher jar. + def launcherDeps = ['log4j-api', 'log4j-core', 'commons-io'] + doFirst { + def byModule = [:] + configurations.runtimeClasspath.incoming.artifacts.each { a -> + def id = a.id.componentIdentifier + if (id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier) { + byModule[id.module] = a.file.name + } + } + manifest.attributes['Class-Path'] = launcherDeps.collect { m -> + def jar = byModule[m] + if (jar == null) { + throw new GradleException("launcher Class-Path dependency '${m}' not resolved") + } + "cli-lib/${jar}" + }.join(' ') + ' conf/' + } +} + +def copyBuildConf = tasks.register('copyBuildConf', Copy) { + from 'conf' + into layout.buildDirectory.dir('conf') +} + +def commandPlacements = rootProject.stagedArtifacts(configurations.runtimeClasspath, 'command') +def copyBuildCliLib = tasks.register('copyBuildCliLib', Copy) { + from 'lib' + from(files({ commandPlacements().keySet() })) { + eachFile { it.path = commandPlacements()[it.file] } + includeEmptyDirs = false + } + into layout.buildDirectory.dir('cli-lib') + dependsOn prepareCliLibs +} + +assemble.dependsOn cliJar, cliLauncherJar, copyBuildConf, copyBuildCliLib + +clean { + delete 'classes', 'test_classes', 'dist' +} diff --git a/command/build.properties b/command/build.properties deleted file mode 100644 index 917d507467..0000000000 --- a/command/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -# top level directories -src=${basedir}/src -classes=${basedir}/classes -lib=${basedir}/lib -conf=${basedir}/conf -build.dir=${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 - -# Reports -reports.dir=${build.dir}/reports - -# JUnit Raw Results (XML) -test.results.dir=${build.dir}/test-results/test - -# JUnit Human-Readable Reports (HTML) -reports.tests.dir=${reports.dir}/tests/test - -# JaCoCo Execution Data (.exec) -jacoco.data.dir=${build.dir}/jacoco -jacoco.exec.file=${jacoco.data.dir}/test.exec - -# JaCoCo Reports (HTML and XML) -reports.jacoco.dir=${reports.dir}/jacoco/test -reports.jacoco.html=${reports.jacoco.dir}/html -reports.jacoco.xml=${reports.jacoco.dir}/jacocoTestReport.xml - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/command/build.xml b/command/build.xml deleted file mode 100644 index b0da1b2e66..0000000000 --- a/command/build.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests WITH JaCoCo coverage. - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests. Coverage is only enabled if 'jacoco.agent.arg' is set. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/command/lib/bcpkix-jdk18on-1.78.1.jar b/command/lib/bcpkix-jdk18on-1.78.1.jar deleted file mode 100644 index dca7170eeb..0000000000 Binary files a/command/lib/bcpkix-jdk18on-1.78.1.jar and /dev/null differ diff --git a/command/lib/bcprov-jdk18on-1.78.1.jar b/command/lib/bcprov-jdk18on-1.78.1.jar deleted file mode 100644 index 6726f83391..0000000000 Binary files a/command/lib/bcprov-jdk18on-1.78.1.jar and /dev/null differ diff --git a/command/lib/bcutil-jdk18on-1.78.1.jar b/command/lib/bcutil-jdk18on-1.78.1.jar deleted file mode 100644 index 348a2fff6d..0000000000 Binary files a/command/lib/bcutil-jdk18on-1.78.1.jar and /dev/null differ diff --git a/command/lib/commons-beanutils-1.11.0.jar b/command/lib/commons-beanutils-1.11.0.jar deleted file mode 100644 index 6b7b993661..0000000000 Binary files a/command/lib/commons-beanutils-1.11.0.jar and /dev/null differ diff --git a/command/lib/commons-cli-1.2.jar b/command/lib/commons-cli-1.2.jar deleted file mode 100644 index ce4b9fffe4..0000000000 Binary files a/command/lib/commons-cli-1.2.jar and /dev/null differ diff --git a/command/lib/commons-codec-1.21.0.jar b/command/lib/commons-codec-1.21.0.jar deleted file mode 100644 index 99989eb59b..0000000000 Binary files a/command/lib/commons-codec-1.21.0.jar and /dev/null differ diff --git a/command/lib/commons-collections4-4.4.jar b/command/lib/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4ba..0000000000 Binary files a/command/lib/commons-collections4-4.4.jar and /dev/null differ diff --git a/command/lib/commons-configuration2-2.13.0.jar b/command/lib/commons-configuration2-2.13.0.jar deleted file mode 100644 index 1809bc354d..0000000000 Binary files a/command/lib/commons-configuration2-2.13.0.jar and /dev/null differ diff --git a/command/lib/commons-io-2.21.0.jar b/command/lib/commons-io-2.21.0.jar deleted file mode 100644 index 7f1688194e..0000000000 Binary files a/command/lib/commons-io-2.21.0.jar and /dev/null differ diff --git a/command/lib/commons-lang3-3.20.0.jar b/command/lib/commons-lang3-3.20.0.jar deleted file mode 100644 index 8682b86d3f..0000000000 Binary files a/command/lib/commons-lang3-3.20.0.jar and /dev/null differ diff --git a/command/lib/commons-logging-1.3.5.jar b/command/lib/commons-logging-1.3.5.jar deleted file mode 100644 index 75d93a15cf..0000000000 Binary files a/command/lib/commons-logging-1.3.5.jar and /dev/null differ diff --git a/command/lib/commons-pool2-2.3.jar b/command/lib/commons-pool2-2.3.jar deleted file mode 100644 index 5219e1cc23..0000000000 Binary files a/command/lib/commons-pool2-2.3.jar and /dev/null differ diff --git a/command/lib/commons-text-1.15.0.jar b/command/lib/commons-text-1.15.0.jar deleted file mode 100644 index 1ac427909f..0000000000 Binary files a/command/lib/commons-text-1.15.0.jar and /dev/null differ diff --git a/command/lib/commons-vfs2-2.10.0.jar b/command/lib/commons-vfs2-2.10.0.jar deleted file mode 100644 index cf5182ed13..0000000000 Binary files a/command/lib/commons-vfs2-2.10.0.jar and /dev/null differ diff --git a/command/lib/guava-32.0.1-jre.jar b/command/lib/guava-32.0.1-jre.jar deleted file mode 100644 index 5f3a1eee94..0000000000 Binary files a/command/lib/guava-32.0.1-jre.jar and /dev/null differ diff --git a/command/lib/hk2-api-2.4.0-b31.jar b/command/lib/hk2-api-2.4.0-b31.jar deleted file mode 100644 index 6a70ef3c18..0000000000 Binary files a/command/lib/hk2-api-2.4.0-b31.jar and /dev/null differ diff --git a/command/lib/hk2-locator-2.4.0-b31.jar b/command/lib/hk2-locator-2.4.0-b31.jar deleted file mode 100644 index 1f38d250d1..0000000000 Binary files a/command/lib/hk2-locator-2.4.0-b31.jar and /dev/null differ diff --git a/command/lib/hk2-utils-2.4.0-b31.jar b/command/lib/hk2-utils-2.4.0-b31.jar deleted file mode 100644 index 211ce37b11..0000000000 Binary files a/command/lib/hk2-utils-2.4.0-b31.jar and /dev/null differ diff --git a/command/lib/httpclient-4.5.13.jar b/command/lib/httpclient-4.5.13.jar deleted file mode 100644 index 218ee25f2b..0000000000 Binary files a/command/lib/httpclient-4.5.13.jar and /dev/null differ diff --git a/command/lib/httpcore-4.4.13.jar b/command/lib/httpcore-4.4.13.jar deleted file mode 100644 index 163dc438cb..0000000000 Binary files a/command/lib/httpcore-4.4.13.jar and /dev/null differ diff --git a/command/lib/httpmime-4.5.13.jar b/command/lib/httpmime-4.5.13.jar deleted file mode 100644 index cc52f44a3a..0000000000 Binary files a/command/lib/httpmime-4.5.13.jar and /dev/null differ diff --git a/command/lib/jackson-annotations-2.14.3.jar b/command/lib/jackson-annotations-2.14.3.jar deleted file mode 100644 index f10f7802de..0000000000 Binary files a/command/lib/jackson-annotations-2.14.3.jar and /dev/null differ diff --git a/command/lib/jackson-core-2.14.3.jar b/command/lib/jackson-core-2.14.3.jar deleted file mode 100644 index b1fb3f270e..0000000000 Binary files a/command/lib/jackson-core-2.14.3.jar and /dev/null differ diff --git a/command/lib/jackson-databind-2.14.3.jar b/command/lib/jackson-databind-2.14.3.jar deleted file mode 100644 index a4791e503d..0000000000 Binary files a/command/lib/jackson-databind-2.14.3.jar and /dev/null differ diff --git a/command/lib/jakarta.activation-1.2.1.jar b/command/lib/jakarta.activation-1.2.1.jar deleted file mode 100644 index fa6aad23af..0000000000 Binary files a/command/lib/jakarta.activation-1.2.1.jar and /dev/null differ diff --git a/command/lib/javassist-3.26.0-GA.jar b/command/lib/javassist-3.26.0-GA.jar deleted file mode 100644 index cb87f4a6a3..0000000000 Binary files a/command/lib/javassist-3.26.0-GA.jar and /dev/null differ diff --git a/command/lib/javax.activation-api-1.2.0.jar b/command/lib/javax.activation-api-1.2.0.jar deleted file mode 100644 index 986c365096..0000000000 Binary files a/command/lib/javax.activation-api-1.2.0.jar and /dev/null differ diff --git a/command/lib/javax.annotation-api-1.3.jar b/command/lib/javax.annotation-api-1.3.jar deleted file mode 100644 index 3f9da003e1..0000000000 Binary files a/command/lib/javax.annotation-api-1.3.jar and /dev/null differ diff --git a/command/lib/javax.inject-2.4.0-b31.jar b/command/lib/javax.inject-2.4.0-b31.jar deleted file mode 100644 index 1f60d98a76..0000000000 Binary files a/command/lib/javax.inject-2.4.0-b31.jar and /dev/null differ diff --git a/command/lib/javax.ws.rs-api-2.0.1.jar b/command/lib/javax.ws.rs-api-2.0.1.jar deleted file mode 100644 index 7eb68b4a0a..0000000000 Binary files a/command/lib/javax.ws.rs-api-2.0.1.jar and /dev/null differ diff --git a/command/lib/jaxb-api-2.4.0-b180725.0427.jar b/command/lib/jaxb-api-2.4.0-b180725.0427.jar deleted file mode 100644 index 5dea8fef42..0000000000 Binary files a/command/lib/jaxb-api-2.4.0-b180725.0427.jar and /dev/null differ diff --git a/command/lib/jaxb-runtime-2.4.0-b180725.0644.jar b/command/lib/jaxb-runtime-2.4.0-b180725.0644.jar deleted file mode 100644 index 8ddbf7d6b7..0000000000 Binary files a/command/lib/jaxb-runtime-2.4.0-b180725.0644.jar and /dev/null differ diff --git a/command/lib/jersey-client-2.22.1.jar b/command/lib/jersey-client-2.22.1.jar deleted file mode 100644 index 687843e168..0000000000 Binary files a/command/lib/jersey-client-2.22.1.jar and /dev/null differ diff --git a/command/lib/jersey-common-2.22.1.jar b/command/lib/jersey-common-2.22.1.jar deleted file mode 100644 index 9ee53873df..0000000000 Binary files a/command/lib/jersey-common-2.22.1.jar and /dev/null differ diff --git a/command/lib/jersey-guava-2.22.1.jar b/command/lib/jersey-guava-2.22.1.jar deleted file mode 100644 index 70f3a0761a..0000000000 Binary files a/command/lib/jersey-guava-2.22.1.jar and /dev/null differ diff --git a/command/lib/jersey-media-multipart-2.22.1.jar b/command/lib/jersey-media-multipart-2.22.1.jar deleted file mode 100644 index 6e7bc572a2..0000000000 Binary files a/command/lib/jersey-media-multipart-2.22.1.jar and /dev/null differ diff --git a/command/lib/jersey-proxy-client-2.22.1.jar b/command/lib/jersey-proxy-client-2.22.1.jar deleted file mode 100644 index c64e39ca7a..0000000000 Binary files a/command/lib/jersey-proxy-client-2.22.1.jar and /dev/null differ diff --git a/command/lib/jetty-util-9.4.57.v20241219.jar b/command/lib/jetty-util-9.4.57.v20241219.jar deleted file mode 100644 index caeda5de3e..0000000000 Binary files a/command/lib/jetty-util-9.4.57.v20241219.jar and /dev/null differ diff --git a/command/lib/log4j-api-2.25.3.jar b/command/lib/log4j-api-2.25.3.jar deleted file mode 100644 index 640998bb34..0000000000 Binary files a/command/lib/log4j-api-2.25.3.jar and /dev/null differ diff --git a/command/lib/log4j-core-2.25.3.jar b/command/lib/log4j-core-2.25.3.jar deleted file mode 100644 index a26e5b0164..0000000000 Binary files a/command/lib/log4j-core-2.25.3.jar and /dev/null differ diff --git a/command/lib/mimepull-1.9.7.jar b/command/lib/mimepull-1.9.7.jar deleted file mode 100644 index 9fb1fd67b6..0000000000 Binary files a/command/lib/mimepull-1.9.7.jar and /dev/null differ diff --git a/command/lib/reflections-0.9.10.jar b/command/lib/reflections-0.9.10.jar deleted file mode 100644 index c255641827..0000000000 Binary files a/command/lib/reflections-0.9.10.jar and /dev/null differ diff --git a/command/lib/rhino-1.7.13.jar b/command/lib/rhino-1.7.13.jar deleted file mode 100644 index 6433ffc3e7..0000000000 Binary files a/command/lib/rhino-1.7.13.jar and /dev/null differ diff --git a/command/lib/slf4j-api-1.7.30.jar b/command/lib/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/command/lib/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/command/lib/slf4j-log4j12-1.7.30.jar b/command/lib/slf4j-log4j12-1.7.30.jar deleted file mode 100644 index c6bc8b2efe..0000000000 Binary files a/command/lib/slf4j-log4j12-1.7.30.jar and /dev/null differ diff --git a/command/lib/staxon-1.3.jar b/command/lib/staxon-1.3.jar deleted file mode 100644 index 7ba528985b..0000000000 Binary files a/command/lib/staxon-1.3.jar and /dev/null differ diff --git a/command/lib/swagger-annotations-2.0.10.jar b/command/lib/swagger-annotations-2.0.10.jar deleted file mode 100644 index cd67b28a2f..0000000000 Binary files a/command/lib/swagger-annotations-2.0.10.jar and /dev/null differ diff --git a/command/lib/velocity-engine-core-2.3.jar b/command/lib/velocity-engine-core-2.3.jar deleted file mode 100644 index 879a7b4d51..0000000000 Binary files a/command/lib/velocity-engine-core-2.3.jar and /dev/null differ diff --git a/command/lib/velocity-tools-generic-3.1.jar b/command/lib/velocity-tools-generic-3.1.jar deleted file mode 100644 index 40afab6de8..0000000000 Binary files a/command/lib/velocity-tools-generic-3.1.jar and /dev/null differ diff --git a/command/lib/xpp3-1.1.4c.jar b/command/lib/xpp3-1.1.4c.jar deleted file mode 100644 index 451ac82af4..0000000000 Binary files a/command/lib/xpp3-1.1.4c.jar and /dev/null differ diff --git a/command/lib/xstream-1.4.20.jar b/command/lib/xstream-1.4.20.jar deleted file mode 100644 index a8f7cd8028..0000000000 Binary files a/command/lib/xstream-1.4.20.jar and /dev/null differ 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/test/com/mirth/connect/cli/launcher/CommandLineLauncherTest.java b/command/src/test/java/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/java/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/dependency-check.xml b/dependency-check.xml deleted file mode 100644 index 342d57e97c..0000000000 --- a/dependency-check.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - NG Connect Dependency Checker Help - Run target 'dependency-check' to execute dependency check. - Whatever user is running the job needs read/write access to dependency-check.home directory. - Use chmod and chown to change permissions/ownership. - Report will be outputted to ./dependency-check-report.html. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/donkey/.classpath b/donkey/.classpath deleted file mode 100644 index b805684d92..0000000000 --- a/donkey/.classpath +++ /dev/null @@ -1,88 +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..dfe4615c42 --- /dev/null +++ b/donkey/build.gradle @@ -0,0 +1,51 @@ +// Donkey: the message engine. Produces donkey-model.jar and +// donkey-server.jar in donkey/setup (mirrors donkey/build.xml). + +dependencies { + implementation libs.bundles.donkey.main + testImplementation libs.bundles.donkey.test +} + +def donkeyModelJar = tasks.register('donkeyModelJar', Jar) { + archiveFileName = 'donkey-model.jar' + destinationDirectory = file('setup') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/donkey/model/**' + include 'com/mirth/connect/donkey/util/**' + } +} + +def donkeyServerJar = tasks.register('donkeyServerJar', Jar) { + archiveFileName = 'donkey-server.jar' + destinationDirectory = file('setup') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/donkey/server/**' + include 'com/mirth/connect/donkey/model/**' + include 'com/mirth/connect/donkey/util/**' + } + from 'donkeydbconf' +} + +// Assembles the historical lib layout: still-vendored jars from lib/ +// plus the resolved Maven Central artifacts placed at their original +// paths (gradle/vendored-layout.json). +def donkeyPlacements = rootProject.stagedArtifacts(configurations.runtimeClasspath, 'donkey') +def copySetupLibs = tasks.register('copySetupLibs', Copy) { + from 'lib' + from(files({ donkeyPlacements().keySet() })) { + eachFile { it.path = donkeyPlacements()[it.file] } + includeEmptyDirs = false + } + into 'setup/lib' +} + +def copySetupDocs = tasks.register('copySetupDocs', Copy) { + from 'docs' + into 'setup/docs' +} + +assemble.dependsOn donkeyModelJar, donkeyServerJar, copySetupLibs, copySetupDocs + +clean { + delete 'classes', 'test_classes', 'setup' +} diff --git a/donkey/build.properties b/donkey/build.properties deleted file mode 100644 index 58466c9c50..0000000000 --- a/donkey/build.properties +++ /dev/null @@ -1,42 +0,0 @@ -# top level directories -src=${basedir}/src/main/java -classes=${basedir}/classes -test=${basedir}/src/test/java -test_classes=${basedir}/test_classes -build.dir=${basedir}/build -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 - -# Reports -reports.dir=${build.dir}/reports - -# JUnit Raw Results (XML) -test.results.dir=${build.dir}/test-results/test - -# JUnit Human-Readable Reports (HTML) -reports.tests.dir=${reports.dir}/tests/test - -# JaCoCo Execution Data (.exec) -jacoco.data.dir=${build.dir}/jacoco -jacoco.exec.file=${jacoco.data.dir}/test.exec - -# JaCoCo Reports (HTML and XML) -reports.jacoco.dir=${reports.dir}/jacoco/test -reports.jacoco.html=${reports.jacoco.dir}/html -reports.jacoco.xml=${reports.jacoco.dir}/jacocoTestReport.xml - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/donkey/build.xml b/donkey/build.xml deleted file mode 100644 index 7dc831adbd..0000000000 --- a/donkey/build.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests WITH JaCoCo coverage. - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests. Coverage is only enabled if 'jacoco.agent.arg' is set. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/donkey/lib/HikariCP-2.5.1.jar b/donkey/lib/HikariCP-2.5.1.jar deleted file mode 100644 index bcd609f76d..0000000000 Binary files a/donkey/lib/HikariCP-2.5.1.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-beanutils-1.11.0.jar b/donkey/lib/commons/commons-beanutils-1.11.0.jar deleted file mode 100644 index 6b7b993661..0000000000 Binary files a/donkey/lib/commons/commons-beanutils-1.11.0.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-codec-1.21.0.jar b/donkey/lib/commons/commons-codec-1.21.0.jar deleted file mode 100644 index 99989eb59b..0000000000 Binary files a/donkey/lib/commons/commons-codec-1.21.0.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-collections4-4.4.jar b/donkey/lib/commons/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4ba..0000000000 Binary files a/donkey/lib/commons/commons-collections4-4.4.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-dbcp2-2.0.1.jar b/donkey/lib/commons/commons-dbcp2-2.0.1.jar deleted file mode 100644 index 5e8d142dd7..0000000000 Binary files a/donkey/lib/commons/commons-dbcp2-2.0.1.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-dbutils-1.7.jar b/donkey/lib/commons/commons-dbutils-1.7.jar deleted file mode 100644 index b30458ee54..0000000000 Binary files a/donkey/lib/commons/commons-dbutils-1.7.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-io-2.21.0.jar b/donkey/lib/commons/commons-io-2.21.0.jar deleted file mode 100644 index 7f1688194e..0000000000 Binary files a/donkey/lib/commons/commons-io-2.21.0.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-lang3-3.20.0.jar b/donkey/lib/commons/commons-lang3-3.20.0.jar deleted file mode 100644 index 8682b86d3f..0000000000 Binary files a/donkey/lib/commons/commons-lang3-3.20.0.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-logging-1.3.5.jar b/donkey/lib/commons/commons-logging-1.3.5.jar deleted file mode 100644 index 75d93a15cf..0000000000 Binary files a/donkey/lib/commons/commons-logging-1.3.5.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-math3-3.0.jar b/donkey/lib/commons/commons-math3-3.0.jar deleted file mode 100644 index ff84bd293c..0000000000 Binary files a/donkey/lib/commons/commons-math3-3.0.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-pool2-2.3.jar b/donkey/lib/commons/commons-pool2-2.3.jar deleted file mode 100644 index 5219e1cc23..0000000000 Binary files a/donkey/lib/commons/commons-pool2-2.3.jar and /dev/null differ diff --git a/donkey/lib/commons/commons-text-1.15.0.jar b/donkey/lib/commons/commons-text-1.15.0.jar deleted file mode 100644 index 1ac427909f..0000000000 Binary files a/donkey/lib/commons/commons-text-1.15.0.jar and /dev/null differ diff --git a/donkey/lib/database/derby-10.10.2.0.jar b/donkey/lib/database/derby-10.10.2.0.jar deleted file mode 100644 index a4d56f0d41..0000000000 Binary files a/donkey/lib/database/derby-10.10.2.0.jar and /dev/null differ diff --git a/donkey/lib/database/mssql-jdbc-8.4.1.jre8.jar b/donkey/lib/database/mssql-jdbc-8.4.1.jre8.jar deleted file mode 100644 index ad0b4b5b74..0000000000 Binary files a/donkey/lib/database/mssql-jdbc-8.4.1.jre8.jar and /dev/null differ diff --git a/donkey/lib/database/mysql-connector-j-8.4.0.jar b/donkey/lib/database/mysql-connector-j-8.4.0.jar deleted file mode 100644 index 8294fe0b40..0000000000 Binary files a/donkey/lib/database/mysql-connector-j-8.4.0.jar and /dev/null differ diff --git a/donkey/lib/database/ojdbc8-12.2.0.1.jar b/donkey/lib/database/ojdbc8-12.2.0.1.jar deleted file mode 100644 index bf412434bd..0000000000 Binary files a/donkey/lib/database/ojdbc8-12.2.0.1.jar and /dev/null differ diff --git a/donkey/lib/database/postgresql-42.7.8.jar b/donkey/lib/database/postgresql-42.7.8.jar deleted file mode 100644 index a9500ac258..0000000000 Binary files a/donkey/lib/database/postgresql-42.7.8.jar and /dev/null differ diff --git a/donkey/lib/guava/checker-qual-2.10.0.jar b/donkey/lib/guava/checker-qual-2.10.0.jar deleted file mode 100644 index 9ea731eff0..0000000000 Binary files a/donkey/lib/guava/checker-qual-2.10.0.jar and /dev/null differ diff --git a/donkey/lib/guava/error_prone_annotations-2.3.4.jar b/donkey/lib/guava/error_prone_annotations-2.3.4.jar deleted file mode 100644 index c9bea2abc4..0000000000 Binary files a/donkey/lib/guava/error_prone_annotations-2.3.4.jar and /dev/null differ diff --git a/donkey/lib/guava/failureaccess-1.0.1.jar b/donkey/lib/guava/failureaccess-1.0.1.jar deleted file mode 100644 index 9b56dc751c..0000000000 Binary files a/donkey/lib/guava/failureaccess-1.0.1.jar and /dev/null differ diff --git a/donkey/lib/guava/guava-32.0.1-jre.jar b/donkey/lib/guava/guava-32.0.1-jre.jar deleted file mode 100644 index 5f3a1eee94..0000000000 Binary files a/donkey/lib/guava/guava-32.0.1-jre.jar and /dev/null differ diff --git a/donkey/lib/guava/j2objc-annotations-1.3.jar b/donkey/lib/guava/j2objc-annotations-1.3.jar deleted file mode 100644 index a429c7219d..0000000000 Binary files a/donkey/lib/guava/j2objc-annotations-1.3.jar and /dev/null differ diff --git a/donkey/lib/guava/jsr305-3.0.2.jar b/donkey/lib/guava/jsr305-3.0.2.jar deleted file mode 100644 index 59222d9ca5..0000000000 Binary files a/donkey/lib/guava/jsr305-3.0.2.jar and /dev/null differ diff --git a/donkey/lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/donkey/lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar deleted file mode 100644 index 45832c052a..0000000000 Binary files a/donkey/lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar and /dev/null differ diff --git a/donkey/lib/guice-4.1.0.jar b/donkey/lib/guice-4.1.0.jar deleted file mode 100644 index 92cad689de..0000000000 Binary files a/donkey/lib/guice-4.1.0.jar and /dev/null differ diff --git a/donkey/lib/javassist-3.26.0-GA.jar b/donkey/lib/javassist-3.26.0-GA.jar deleted file mode 100644 index cb87f4a6a3..0000000000 Binary files a/donkey/lib/javassist-3.26.0-GA.jar and /dev/null differ diff --git a/donkey/lib/log4j-1.2-api-2.25.3.jar b/donkey/lib/log4j-1.2-api-2.25.3.jar deleted file mode 100644 index 680b5e1a8e..0000000000 Binary files a/donkey/lib/log4j-1.2-api-2.25.3.jar and /dev/null differ diff --git a/donkey/lib/log4j-api-2.25.3.jar b/donkey/lib/log4j-api-2.25.3.jar deleted file mode 100644 index 640998bb34..0000000000 Binary files a/donkey/lib/log4j-api-2.25.3.jar and /dev/null differ diff --git a/donkey/lib/log4j-core-2.25.3.jar b/donkey/lib/log4j-core-2.25.3.jar deleted file mode 100644 index a26e5b0164..0000000000 Binary files a/donkey/lib/log4j-core-2.25.3.jar and /dev/null differ diff --git a/donkey/lib/quartz-2.3.2.jar b/donkey/lib/quartz-2.3.2.jar deleted file mode 100644 index 8b7388287d..0000000000 Binary files a/donkey/lib/quartz-2.3.2.jar and /dev/null differ diff --git a/donkey/lib/slf4j-api-1.7.30.jar b/donkey/lib/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/donkey/lib/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/donkey/lib/slf4j-log4j12-1.7.30.jar b/donkey/lib/slf4j-log4j12-1.7.30.jar deleted file mode 100644 index c6bc8b2efe..0000000000 Binary files a/donkey/lib/slf4j-log4j12-1.7.30.jar and /dev/null differ diff --git a/donkey/lib/xstream/xpp3-1.1.4c.jar b/donkey/lib/xstream/xpp3-1.1.4c.jar deleted file mode 100644 index 451ac82af4..0000000000 Binary files a/donkey/lib/xstream/xpp3-1.1.4c.jar and /dev/null differ diff --git a/donkey/lib/xstream/xstream-1.4.20.jar b/donkey/lib/xstream/xstream-1.4.20.jar deleted file mode 100644 index a8f7cd8028..0000000000 Binary files a/donkey/lib/xstream/xstream-1.4.20.jar and /dev/null differ 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.14.13.jar b/donkey/testlib/byte-buddy-1.14.13.jar deleted file mode 100644 index 791db5e61f..0000000000 Binary files a/donkey/testlib/byte-buddy-1.14.13.jar and /dev/null differ diff --git a/donkey/testlib/byte-buddy-agent-1.14.13.jar b/donkey/testlib/byte-buddy-agent-1.14.13.jar deleted file mode 100644 index 3223ba8933..0000000000 Binary files a/donkey/testlib/byte-buddy-agent-1.14.13.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-5.1.1.jar b/donkey/testlib/mockito-core-5.1.1.jar deleted file mode 100644 index 234bea1474..0000000000 Binary files a/donkey/testlib/mockito-core-5.1.1.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 6dd66c2c3b..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..45c6f31f51 --- /dev/null +++ b/generator/build.gradle @@ -0,0 +1,54 @@ +// HL7 vocabulary generator tooling (mirrors generator/build.xml). Not part +// of the main distribution build; run :generator:vocabJar manually to +// regenerate the vocabulary jar from the reference definitions. + +dependencies { + implementation libs.bundles.generator.main +} + +sourceSets.main.java { + exclude '**/test/**' +} + +def generatorJar = tasks.register('generatorJar', Jar) { + archiveFileName = 'model-generator.jar' + destinationDirectory = file('dist') + from sourceSets.main.output.classesDirs +} + +def generateVocabSource = tasks.register('generateVocabSource', JavaExec) { + description = 'Generates the HL7 vocabulary sources from the reference definitions.' + mainClass = 'com.mirth.connect.model.generator.HL7ModelGenerator' + workingDir = projectDir + classpath = sourceSets.main.runtimeClasspath + args 'reference', 'vocab/src', 'templates' + inputs.dir 'reference' + inputs.dir 'templates' + inputs.files sourceSets.main.output + outputs.dir 'vocab/src' + dependsOn compileJava +} + +def compileVocab = tasks.register('compileVocab', JavaCompile) { + source = fileTree('vocab/src') + destinationDirectory = file('vocab/classes') + classpath = sourceSets.main.runtimeClasspath + options.encoding = 'UTF-8' + dependsOn generateVocabSource +} + +tasks.register('vocabJar', Jar) { + description = 'Builds the mirth vocabulary jar from generated sources.' + archiveFileName = 'mirth-vocab-1.2.jar' + destinationDirectory = file('vocab/dist') + from compileVocab + from(sourceSets.main.output.classesDirs) { + include '**/hl7v2/**/*.class' + } +} + +assemble.dependsOn generatorJar + +clean { + delete 'classes', 'dist', 'vocab' +} diff --git a/generator/build.properties b/generator/build.properties deleted file mode 100644 index 8f19ed4efa..0000000000 --- a/generator/build.properties +++ /dev/null @@ -1,15 +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 - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/generator/build.xml b/generator/build.xml deleted file mode 100644 index 854bc07bc7..0000000000 --- a/generator/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/generator/lib/commons-collections4-4.4.jar b/generator/lib/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4ba..0000000000 Binary files a/generator/lib/commons-collections4-4.4.jar and /dev/null differ diff --git a/generator/lib/commons-io-2.21.0.jar b/generator/lib/commons-io-2.21.0.jar deleted file mode 100644 index 7f1688194e..0000000000 Binary files a/generator/lib/commons-io-2.21.0.jar and /dev/null differ diff --git a/generator/lib/commons-lang3-3.20.0.jar b/generator/lib/commons-lang3-3.20.0.jar deleted file mode 100644 index 8682b86d3f..0000000000 Binary files a/generator/lib/commons-lang3-3.20.0.jar and /dev/null differ diff --git a/generator/lib/log4j-1.2-api-2.25.3.jar b/generator/lib/log4j-1.2-api-2.25.3.jar deleted file mode 100644 index 680b5e1a8e..0000000000 Binary files a/generator/lib/log4j-1.2-api-2.25.3.jar and /dev/null differ diff --git a/generator/lib/log4j-api-2.25.3.jar b/generator/lib/log4j-api-2.25.3.jar deleted file mode 100644 index 640998bb34..0000000000 Binary files a/generator/lib/log4j-api-2.25.3.jar and /dev/null differ diff --git a/generator/lib/log4j-core-2.25.3.jar b/generator/lib/log4j-core-2.25.3.jar deleted file mode 100644 index a26e5b0164..0000000000 Binary files a/generator/lib/log4j-core-2.25.3.jar and /dev/null differ diff --git a/generator/lib/slf4j-api-1.7.30.jar b/generator/lib/slf4j-api-1.7.30.jar deleted file mode 100644 index 29ac26fb8c..0000000000 Binary files a/generator/lib/slf4j-api-1.7.30.jar and /dev/null differ diff --git a/generator/lib/slf4j-log4j12-1.7.30.jar b/generator/lib/slf4j-log4j12-1.7.30.jar deleted file mode 100644 index c6bc8b2efe..0000000000 Binary files a/generator/lib/slf4j-log4j12-1.7.30.jar and /dev/null differ diff --git a/generator/lib/velocity-engine-core-2.3.jar b/generator/lib/velocity-engine-core-2.3.jar deleted file mode 100644 index 879a7b4d51..0000000000 Binary files a/generator/lib/velocity-engine-core-2.3.jar and /dev/null differ 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..c0936bd3cd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +version=4.6.0 + +# Keep file encoding deterministic across platforms so compiled output +# is reproducible. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..0271f6fec4 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,230 @@ +# Generated from the vendored-jar provenance sweep (SHA-1 exact +# matches against Maven Central). Versions match the vendored jars +# byte for byte; see gradle/vendored-layout.json for placement. + +[libraries] +annotations = { module = "software.amazon.awssdk:annotations", version = "2.15.28" } +aopalliance-repackaged = { module = "org.glassfish.hk2.external:aopalliance-repackaged", version = "2.4.0-b31" } +apache-client = { module = "software.amazon.awssdk:apache-client", version = "2.15.28" } +apache-el = { module = "org.mortbay.jasper:apache-el", version = "8.5.70" } +apache-jsp = { module = "org.eclipse.jetty:apache-jsp", version = "9.4.57.v20241219" } +apache-jsp-v8-5-70 = { module = "org.mortbay.jasper:apache-jsp", version = "8.5.70" } +asm = { module = "org.ow2.asm:asm", version = "9.6" } +asm-analysis = { module = "org.ow2.asm:asm-analysis", version = "9.6" } +asm-commons = { module = "org.ow2.asm:asm-commons", version = "9.6" } +asm-tree = { module = "org.ow2.asm:asm-tree", version = "9.6" } +asm-util = { module = "org.ow2.asm:asm-util", version = "9.6" } +auth = { module = "software.amazon.awssdk:auth", version = "2.15.28" } +aws-core = { module = "software.amazon.awssdk:aws-core", version = "2.15.28" } +aws-json-protocol = { module = "software.amazon.awssdk:aws-json-protocol", version = "2.15.28" } +aws-query-protocol = { module = "software.amazon.awssdk:aws-query-protocol", version = "2.15.28" } +aws-xml-protocol = { module = "software.amazon.awssdk:aws-xml-protocol", version = "2.15.28" } +bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.78.1" } +bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.78.1" } +bcutil-jdk18on = { module = "org.bouncycastle:bcutil-jdk18on", version = "1.78.1" } +byte-buddy = { module = "net.bytebuddy:byte-buddy", version = "1.14.13" } +byte-buddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version = "1.14.13" } +checker-qual = { module = "org.checkerframework:checker-qual", version = "2.10.0" } +classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.179" } +commons-beanutils = { module = "commons-beanutils:commons-beanutils", version = "1.11.0" } +commons-cli = { module = "commons-cli:commons-cli", version = "1.2" } +commons-codec = { module = "commons-codec:commons-codec", version = "1.21.0" } +commons-collections = { module = "commons-collections:commons-collections", version = "3.2.2" } +commons-collections4 = { module = "org.apache.commons:commons-collections4", version = "4.4" } +commons-compress = { module = "org.apache.commons:commons-compress", version = "1.28.0" } +commons-configuration2 = { module = "org.apache.commons:commons-configuration2", version = "2.13.0" } +commons-dbcp2 = { module = "org.apache.commons:commons-dbcp2", version = "2.0.1" } +commons-dbutils = { module = "commons-dbutils:commons-dbutils", version = "1.7" } +commons-digester3 = { module = "org.apache.commons:commons-digester3", version = "3.2" } +commons-el = { module = "commons-el:commons-el", version = "1.0" } +commons-email = { module = "org.apache.commons:commons-email", version = "1.6.0" } +commons-fileupload = { module = "commons-fileupload:commons-fileupload", version = "1.6.0" } +commons-httpclient = { module = "commons-httpclient:commons-httpclient", version = "3.0.1" } +commons-io = { module = "commons-io:commons-io", version = "2.21.0" } +commons-jxpath = { module = "commons-jxpath:commons-jxpath", version = "1.3" } +commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.20.0" } +commons-logging = { module = "commons-logging:commons-logging", version = "1.3.5" } +commons-math3 = { module = "org.apache.commons:commons-math3", version = "3.0" } +commons-net = { module = "commons-net:commons-net", version = "3.9.0" } +commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.3" } +commons-text = { module = "org.apache.commons:commons-text", version = "1.15.0" } +commons-vfs2 = { module = "org.apache.commons:commons-vfs2", version = "2.10.0" } +derby = { module = "org.apache.derby:derby", version = "10.10.2.0" } +derbytools = { module = "org.apache.derby:derbytools", version = "10.10.2.0" } +ecj = { module = "org.eclipse.jdt:ecj", version = "3.19.0" } +error-prone-annotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.3.4" } +eventstream = { module = "software.amazon.eventstream:eventstream", version = "1.0.1" } +failureaccess = { module = "com.google.guava:failureaccess", version = "1.0.1" } +fastinfoset = { module = "com.sun.xml.fastinfoset:FastInfoset", version = "1.2.13" } +flying-saucer-core = { module = "org.xhtmlrenderer:flying-saucer-core", version = "9.0.1" } +flying-saucer-pdf = { module = "org.xhtmlrenderer:flying-saucer-pdf", version = "9.0.1" } +fontbox = { module = "org.apache.pdfbox:fontbox", version = "2.0.24" } +geronimo-j2ee-management-1-1-spec = { module = "org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec", version = "1.0.1" } +geronimo-jms-1-1-spec = { module = "org.apache.geronimo.specs:geronimo-jms_1.1_spec", version = "1.1.1" } +gmbal-api-only = { module = "org.glassfish.gmbal:gmbal-api-only", version = "3.1.0-b001" } +graphics2d = { module = "de.rototor.pdfbox:graphics2d", version = "0.32" } +guava = { module = "com.google.guava:guava", version = "32.0.1-jre" } +guice = { module = "com.google.inject:guice", version = "4.1.0" } +ha-api = { module = "org.glassfish.ha:ha-api", version = "3.1.9" } +hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" } +hapi-structures-v27 = { module = "ca.uhn.hapi:hapi-structures-v27", version = "2.3" } +hapi-structures-v28 = { module = "ca.uhn.hapi:hapi-structures-v28", version = "2.3" } +hapi-structures-v281 = { module = "ca.uhn.hapi:hapi-structures-v281", version = "2.3" } +hikaricp = { module = "com.zaxxer:HikariCP", version = "2.5.1" } +hk2-api = { module = "org.glassfish.hk2:hk2-api", version = "2.4.0-b31" } +hk2-locator = { module = "org.glassfish.hk2:hk2-locator", version = "2.4.0-b31" } +hk2-utils = { module = "org.glassfish.hk2:hk2-utils", version = "2.4.0-b31" } +http-client-spi = { module = "software.amazon.awssdk:http-client-spi", version = "2.15.28" } +httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" } +httpcore = { module = "org.apache.httpcomponents:httpcore", version = "4.4.13" } +httpmime = { module = "org.apache.httpcomponents:httpmime", version = "4.5.13" } +imagej = { module = "gov.nih.imagej:imagej", version = "1.42" } +itext = { module = "com.lowagie:itext", version = "2.1.7" } +itext-rtf = { module = "com.lowagie:itext-rtf", version = "2.1.7" } +j2objc-annotations = { module = "com.google.j2objc:j2objc-annotations", version = "1.3" } +jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version = "2.14.3" } +jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version = "2.14.3" } +jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.14.3" } +jackson-dataformat-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version = "2.14.3" } +jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.14.3" } +jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version = "2.14.3" } +jakarta-activation = { module = "com.sun.activation:jakarta.activation", version = "1.2.1" } +jakarta-mail = { module = "com.sun.mail:jakarta.mail", version = "1.6.7" } +java-semver = { module = "com.github.zafarkhaja:java-semver", version = "0.10.2" } +javassist = { module = "org.javassist:javassist", version = "3.26.0-GA" } +javax-activation-api = { module = "javax.activation:javax.activation-api", version = "1.2.0" } +javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" } +javax-annotation-api-v1-3 = { module = "javax.annotation:javax.annotation-api", version = "1.3" } +javax-inject = { module = "org.glassfish.hk2.external:javax.inject", version = "2.4.0-b31" } +javax-json = { module = "org.glassfish:javax.json", version = "1.0.4" } +javax-json-api = { module = "javax.json:javax.json-api", version = "1.0" } +javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } +javax-ws-rs-api = { module = "javax.ws.rs:javax.ws.rs-api", version = "2.0.1" } +javax-xml-soap-api = { module = "javax.xml.soap:javax.xml.soap-api", version = "1.4.0" } +jaxb-api = { module = "javax.xml.bind:jaxb-api", version = "2.4.0-b180725.0427" } +jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version = "2.4.0-b180725.0644" } +jaxws-api = { module = "javax.xml.ws:jaxws-api", version = "2.3.0" } +jaxws-rt = { module = "com.sun.xml.ws:jaxws-rt", version = "2.3.0.2" } +jaxws-tools = { module = "com.sun.xml.ws:jaxws-tools", version = "2.3.0.2" } +jcifs-ng = { module = "eu.agno3.jcifs:jcifs-ng", version = "2.1.10" } +jdom2 = { module = "org.jdom:jdom2", version = "2.0.6.1" } +jersey-client = { module = "org.glassfish.jersey.core:jersey-client", version = "2.22.1" } +jersey-common = { module = "org.glassfish.jersey.core:jersey-common", version = "2.22.1" } +jersey-container-jetty-http = { module = "org.glassfish.jersey.containers:jersey-container-jetty-http", version = "2.22.1" } +jersey-container-jetty-servlet = { module = "org.glassfish.jersey.containers:jersey-container-jetty-servlet", version = "2.22.1" } +jersey-container-servlet = { module = "org.glassfish.jersey.containers:jersey-container-servlet", version = "2.22.1" } +jersey-container-servlet-core = { module = "org.glassfish.jersey.containers:jersey-container-servlet-core", version = "2.22.1" } +jersey-guava = { module = "org.glassfish.jersey.bundles.repackaged:jersey-guava", version = "2.22.1" } +jersey-media-jaxb = { module = "org.glassfish.jersey.media:jersey-media-jaxb", version = "2.22.1" } +jersey-media-multipart = { module = "org.glassfish.jersey.media:jersey-media-multipart", version = "2.22.1" } +jersey-proxy-client = { module = "org.glassfish.jersey.ext:jersey-proxy-client", version = "2.22.1" } +jersey-server = { module = "org.glassfish.jersey.core:jersey-server", version = "2.22.1" } +jetty-annotations = { module = "org.eclipse.jetty:jetty-annotations", version = "9.4.57.v20241219" } +jetty-continuation = { module = "org.eclipse.jetty:jetty-continuation", version = "9.4.57.v20241219" } +jetty-http = { module = "org.eclipse.jetty:jetty-http", version = "9.4.57.v20241219" } +jetty-io = { module = "org.eclipse.jetty:jetty-io", version = "9.4.57.v20241219" } +jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version = "9.4.57.v20241219" } +jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version = "9.4.57.v20241219" } +jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version = "9.4.57.v20241219" } +jetty-schemas = { module = "org.eclipse.jetty.toolchain:jetty-schemas", version = "3.1.2" } +jetty-security = { module = "org.eclipse.jetty:jetty-security", version = "9.4.57.v20241219" } +jetty-server = { module = "org.eclipse.jetty:jetty-server", version = "9.4.57.v20241219" } +jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version = "9.4.57.v20241219" } +jetty-util = { module = "org.eclipse.jetty:jetty-util", version = "9.4.57.v20241219" } +jetty-util-ajax = { module = "org.eclipse.jetty:jetty-util-ajax", version = "9.4.57.v20241219" } +jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version = "9.4.57.v20241219" } +jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version = "9.4.57.v20241219" } +jna = { module = "net.java.dev.jna:jna", version = "4.5.2" } +jna-platform = { module = "net.java.dev.jna:jna-platform", version = "4.5.2" } +joda-time = { module = "joda-time:joda-time", version = "2.9.9" } +jsr181-api = { module = "javax.jws:jsr181-api", version = "1.0-MR1" } +jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } +junit = { module = "junit:junit", version = "4.8.1" } +junit-v4-13-1 = { module = "junit:junit", version = "4.13.1" } +kms = { module = "software.amazon.awssdk:kms", version = "2.15.28" } +libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version = "8.12.50" } +listenablefuture = { module = "com.google.guava:listenablefuture", version = "9999.0-empty-to-avoid-conflict-with-guava" } +log4j-1-2-api = { module = "org.apache.logging.log4j:log4j-1.2-api", version = "2.25.3" } +log4j-api = { module = "org.apache.logging.log4j:log4j-api", version = "2.25.3" } +log4j-core = { module = "org.apache.logging.log4j:log4j-core", version = "2.25.3" } +management-api = { module = "org.glassfish.external:management-api", version = "3.2.1-b001" } +metrics-spi = { module = "software.amazon.awssdk:metrics-spi", version = "2.15.28" } +miglayout-core = { module = "com.miglayout:miglayout-core", version = "4.2" } +miglayout-swing = { module = "com.miglayout:miglayout-swing", version = "4.2" } +mimepull = { module = "org.jvnet.mimepull:mimepull", version = "1.9.7" } +mockito-core = { module = "org.mockito:mockito-core", version = "5.1.1" } +mockito-inline = { module = "org.mockito:mockito-inline", version = "5.1.1" } +mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "8.4.1.jre8" } +mybatis = { module = "org.mybatis:mybatis", version = "3.1.1" } +mysql-connector-j = { module = "com.mysql:mysql-connector-j", version = "8.4.0" } +netty-buffer = { module = "io.netty:netty-buffer", version = "4.1.119.Final" } +netty-codec = { module = "io.netty:netty-codec", version = "4.1.119.Final" } +netty-codec-http = { module = "io.netty:netty-codec-http", version = "4.1.119.Final" } +netty-codec-http2 = { module = "io.netty:netty-codec-http2", version = "4.1.119.Final" } +netty-common = { module = "io.netty:netty-common", version = "4.1.119.Final" } +netty-handler = { module = "io.netty:netty-handler", version = "4.1.119.Final" } +netty-nio-client = { module = "software.amazon.awssdk:netty-nio-client", version = "2.20.140" } +netty-reactive-streams = { module = "com.typesafe.netty:netty-reactive-streams", version = "2.0.8" } +netty-reactive-streams-http = { module = "com.typesafe.netty:netty-reactive-streams-http", version = "2.0.8" } +netty-resolver = { module = "io.netty:netty-resolver", version = "4.1.119.Final" } +netty-transport = { module = "io.netty:netty-transport", version = "4.1.119.Final" } +netty-transport-native-unix-common = { module = "io.netty:netty-transport-native-unix-common", version = "4.1.119.Final" } +objenesis = { module = "org.objenesis:objenesis", version = "2.5.1" } +ojdbc8 = { module = "com.oracle.database.jdbc:ojdbc8", version = "12.2.0.1" } +openhtmltopdf-core = { module = "com.openhtmltopdf:openhtmltopdf-core", version = "1.0.9" } +openhtmltopdf-pdfbox = { module = "com.openhtmltopdf:openhtmltopdf-pdfbox", version = "1.0.9" } +org-osgi-core = { module = "org.osgi:org.osgi.core", version = "4.2.0" } +osgi-resource-locator = { module = "org.glassfish.hk2:osgi-resource-locator", version = "1.0.1" } +oshi-core = { module = "com.github.oshi:oshi-core", version = "3.9.1" } +pdfbox = { module = "org.apache.pdfbox:pdfbox", version = "2.0.24" } +persistence-api = { module = "javax.persistence:persistence-api", version = "1.0" } +policy = { module = "com.sun.xml.ws:policy", version = "2.7.2" } +profiles = { module = "software.amazon.awssdk:profiles", version = "2.15.28" } +protocol-core = { module = "software.amazon.awssdk:protocol-core", version = "2.15.28" } +quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.2" } +reactive-streams = { module = "org.reactivestreams:reactive-streams", version = "1.0.3" } +reflections = { module = "org.reflections:reflections", version = "0.9.10" } +regions = { module = "software.amazon.awssdk:regions", version = "2.15.28" } +rhino = { module = "org.mozilla:rhino", version = "1.7.13" } +s3 = { module = "software.amazon.awssdk:s3", version = "2.15.28" } +saaj-impl = { module = "com.sun.xml.messaging.saaj:saaj-impl", version = "1.4.0" } +sdk-core = { module = "software.amazon.awssdk:sdk-core", version = "2.15.28" } +slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" } +slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version = "1.7.30" } +stax-ex = { module = "org.jvnet.staxex:stax-ex", version = "1.8" } +staxon = { module = "de.odysseus.staxon:staxon", version = "1.3" } +streambuffer = { module = "com.sun.xml.stream.buffer:streambuffer", version = "1.5.4" } +sts = { module = "software.amazon.awssdk:sts", version = "2.15.28" } +swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.0.10" } +swagger-core = { module = "io.swagger.core.v3:swagger-core", version = "2.0.10" } +swagger-integration = { module = "io.swagger.core.v3:swagger-integration", version = "2.0.10" } +swagger-jaxrs2 = { module = "io.swagger.core.v3:swagger-jaxrs2", version = "2.0.10" } +swagger-jaxrs2-servlet-initializer = { module = "io.swagger.core.v3:swagger-jaxrs2-servlet-initializer", version = "2.0.10" } +swagger-models = { module = "io.swagger.core.v3:swagger-models", version = "2.0.10" } +# 1.6.2-2 is the re-release of 1.6.2 with a fixed POM (1.6.2's parent POM +# references an unpublished SNAPSHOT and cannot be resolved); jar bytes identical +swingx-core = { module = "org.swinglabs:swingx-core", version = "1.6.2-2" } +taglibs-standard-impl = { module = "org.apache.taglibs:taglibs-standard-impl", version = "1.2.5" } +taglibs-standard-spec = { module = "org.apache.taglibs:taglibs-standard-spec", version = "1.2.5" } +txw2 = { module = "org.glassfish.jaxb:txw2", version = "2.4.0-b180725.0644" } +utils = { module = "software.amazon.awssdk:utils", version = "2.15.28" } +validation-api = { module = "javax.validation:validation-api", version = "1.1.0.Final" } +velocity-engine-core = { module = "org.apache.velocity:velocity-engine-core", version = "2.3" } +velocity-tools-generic = { module = "org.apache.velocity.tools:velocity-tools-generic", version = "3.1" } +xmpbox = { module = "org.apache.pdfbox:xmpbox", version = "2.0.24" } +xpp3 = { module = "xpp3:xpp3", version = "1.1.4c" } +xstream = { module = "com.thoughtworks.xstream:xstream", version = "1.4.20" } +jsch = { module = "com.github.mwiede:jsch", version = "2.27.7" } +postgresql = { module = "org.postgresql:postgresql", version = "42.7.8" } +snakeyaml = { module = "org.yaml:snakeyaml", version = "2.5" } + +[bundles] +client-main = ["bcpkix-jdk18on", "bcprov-jdk18on", "bcutil-jdk18on", "commons-beanutils", "commons-codec", "commons-collections4", "commons-compress", "commons-configuration2", "commons-io", "commons-lang3", "commons-logging", "commons-pool2", "commons-text", "commons-vfs2", "guava", "hapi-structures-v27", "hapi-structures-v28", "hapi-structures-v281", "hk2-api", "hk2-locator", "hk2-utils", "httpclient", "httpcore", "httpmime", "jackson-annotations", "jackson-core", "jackson-databind", "jakarta-activation", "jakarta-mail", "java-semver", "javassist", "javax-activation-api", "javax-annotation-api", "javax-inject", "javax-ws-rs-api", "jaxb-api", "jaxb-runtime", "jcifs-ng", "jersey-client", "jersey-common", "jersey-guava", "jersey-media-multipart", "jersey-proxy-client", "jetty-util", "joda-time", "libphonenumber", "log4j-1-2-api", "log4j-api", "log4j-core", "miglayout-core", "miglayout-swing", "mimepull", "quartz", "reflections", "regions", "rhino", "slf4j-api", "slf4j-log4j12", "staxon", "swagger-annotations", "swingx-core", "utils", "velocity-engine-core", "velocity-tools-generic", "xpp3", "xstream"] +command-main = ["bcpkix-jdk18on", "bcprov-jdk18on", "bcutil-jdk18on", "commons-beanutils", "commons-cli", "commons-codec", "commons-collections4", "commons-configuration2", "commons-io", "commons-lang3", "commons-logging", "commons-pool2", "commons-text", "commons-vfs2", "guava", "hk2-api", "hk2-locator", "hk2-utils", "httpclient", "httpcore", "httpmime", "jackson-annotations", "jackson-core", "jackson-databind", "jakarta-activation", "javassist", "javax-activation-api", "javax-annotation-api-v1-3", "javax-inject", "javax-ws-rs-api", "jaxb-api", "jaxb-runtime", "jersey-client", "jersey-common", "jersey-guava", "jersey-media-multipart", "jersey-proxy-client", "jetty-util", "log4j-api", "log4j-core", "mimepull", "reflections", "rhino", "slf4j-api", "slf4j-log4j12", "staxon", "swagger-annotations", "velocity-engine-core", "velocity-tools-generic", "xpp3", "xstream"] +command-test = ["junit"] +donkey-main = ["checker-qual", "commons-beanutils", "commons-codec", "commons-collections4", "commons-dbcp2", "commons-dbutils", "commons-io", "commons-lang3", "commons-logging", "commons-math3", "commons-pool2", "commons-text", "derby", "error-prone-annotations", "failureaccess", "guava", "guice", "hikaricp", "j2objc-annotations", "javassist", "jsr305", "listenablefuture", "log4j-1-2-api", "log4j-api", "log4j-core", "mssql-jdbc", "mysql-connector-j", "ojdbc8", "postgresql", "quartz", "slf4j-api", "slf4j-log4j12", "xpp3", "xstream"] +donkey-test = ["aopalliance-repackaged", "byte-buddy", "byte-buddy-agent", "javax-inject", "junit", "mockito-core", "objenesis"] +generator-main = ["commons-collections4", "commons-io", "commons-lang3", "log4j-1-2-api", "log4j-api", "log4j-core", "slf4j-api", "slf4j-log4j12", "velocity-engine-core"] +server-main = ["annotations", "aopalliance-repackaged", "apache-client", "apache-el", "apache-jsp", "apache-jsp-v8-5-70", "asm", "asm-analysis", "asm-commons", "asm-tree", "asm-util", "auth", "aws-core", "aws-json-protocol", "aws-query-protocol", "aws-xml-protocol", "bcpkix-jdk18on", "bcprov-jdk18on", "bcutil-jdk18on", "classgraph", "commons-beanutils", "commons-cli", "commons-codec", "commons-collections", "commons-collections4", "commons-compress", "commons-configuration2", "commons-dbcp2", "commons-dbutils", "commons-digester3", "commons-el", "commons-email", "commons-fileupload", "commons-httpclient", "commons-io", "commons-jxpath", "commons-lang3", "commons-logging", "commons-math3", "commons-net", "commons-pool2", "commons-text", "commons-vfs2", "derby", "derbytools", "ecj", "eventstream", "fastinfoset", "geronimo-j2ee-management-1-1-spec", "geronimo-jms-1-1-spec", "gmbal-api-only", "guice", "ha-api", "hapi-structures-v27", "hapi-structures-v28", "hapi-structures-v281", "hikaricp", "hk2-api", "hk2-locator", "hk2-utils", "http-client-spi", "httpclient", "httpcore", "httpmime", "jackson-annotations", "jackson-core", "jackson-databind", "jackson-dataformat-cbor", "jackson-dataformat-yaml", "jackson-datatype-jsr310", "jakarta-activation", "jakarta-mail", "java-semver", "javassist", "javax-activation-api", "javax-annotation-api", "javax-inject", "javax-json", "javax-json-api", "javax-servlet-api", "javax-ws-rs-api", "javax-xml-soap-api", "jaxb-api", "jaxb-runtime", "jaxws-api", "jaxws-rt", "jaxws-tools", "jdom2", "jersey-client", "jersey-common", "jersey-container-jetty-http", "jersey-container-jetty-servlet", "jersey-container-servlet", "jersey-container-servlet-core", "jersey-guava", "jersey-media-jaxb", "jersey-media-multipart", "jersey-proxy-client", "jersey-server", "jetty-annotations", "jetty-continuation", "jetty-http", "jetty-io", "jetty-jndi", "jetty-plus", "jetty-rewrite", "jetty-schemas", "jetty-security", "jetty-server", "jetty-servlet", "jetty-util", "jetty-util-ajax", "jetty-webapp", "jetty-xml", "jna", "jna-platform", "joda-time", "jsch", "jsr181-api", "kms", "log4j-1-2-api", "log4j-api", "log4j-core", "management-api", "metrics-spi", "mimepull", "mssql-jdbc", "mybatis", "mysql-connector-j", "netty-buffer", "netty-codec", "netty-codec-http", "netty-codec-http2", "netty-common", "netty-handler", "netty-nio-client", "netty-reactive-streams", "netty-reactive-streams-http", "netty-resolver", "netty-transport", "netty-transport-native-unix-common", "ojdbc8", "org-osgi-core", "osgi-resource-locator", "oshi-core", "persistence-api", "policy", "postgresql", "profiles", "protocol-core", "quartz", "reactive-streams", "reflections", "regions", "rhino", "s3", "saaj-impl", "sdk-core", "snakeyaml", "stax-ex", "staxon", "streambuffer", "sts", "swagger-annotations", "swagger-core", "swagger-integration", "swagger-jaxrs2", "swagger-jaxrs2-servlet-initializer", "swagger-models", "taglibs-standard-impl", "taglibs-standard-spec", "txw2", "utils", "validation-api", "velocity-engine-core", "velocity-tools-generic", "xpp3", "xstream"] +server-test = ["byte-buddy", "byte-buddy-agent", "hamcrest", "junit-v4-13-1", "mockito-core", "mockito-inline", "objenesis"] +server-extensions = ["flying-saucer-core", "flying-saucer-pdf", "fontbox", "graphics2d", "imagej", "itext", "itext-rtf", "jcifs-ng", "openhtmltopdf-core", "openhtmltopdf-pdfbox", "pdfbox", "xmpbox"] diff --git a/gradle/vendored-layout.json b/gradle/vendored-layout.json new file mode 100644 index 0000000000..7bffae2a4d --- /dev/null +++ b/gradle/vendored-layout.json @@ -0,0 +1,398 @@ +{ + "client": { + "ca.uhn.hapi:hapi-structures-v27": "", + "ca.uhn.hapi:hapi-structures-v28": "", + "ca.uhn.hapi:hapi-structures-v281": "", + "com.fasterxml.jackson.core:jackson-annotations": "", + "com.fasterxml.jackson.core:jackson-core": "", + "com.fasterxml.jackson.core:jackson-databind": "", + "com.github.zafarkhaja:java-semver": "", + "com.google.guava:guava": "", + "com.googlecode.libphonenumber:libphonenumber": "", + "com.miglayout:miglayout-core": "", + "com.miglayout:miglayout-swing": "", + "com.sun.activation:jakarta.activation": "", + "com.sun.mail:jakarta.mail": "", + "com.thoughtworks.xstream:xstream": "", + "commons-beanutils:commons-beanutils": "", + "commons-codec:commons-codec": "", + "commons-io:commons-io": "", + "commons-logging:commons-logging": "", + "de.odysseus.staxon:staxon": "", + "eu.agno3.jcifs:jcifs-ng": "", + "io.swagger.core.v3:swagger-annotations": "", + "javax.activation:javax.activation-api": "", + "javax.annotation:javax.annotation-api": "", + "javax.ws.rs:javax.ws.rs-api": "", + "javax.xml.bind:jaxb-api": "", + "joda-time:joda-time": "", + "org.apache.commons:commons-collections4": "", + "org.apache.commons:commons-compress": "", + "org.apache.commons:commons-configuration2": "", + "org.apache.commons:commons-lang3": "", + "org.apache.commons:commons-pool2": "", + "org.apache.commons:commons-text": "", + "org.apache.commons:commons-vfs2": "", + "org.apache.httpcomponents:httpclient": "", + "org.apache.httpcomponents:httpcore": "", + "org.apache.httpcomponents:httpmime": "", + "org.apache.logging.log4j:log4j-1.2-api": "", + "org.apache.logging.log4j:log4j-api": "", + "org.apache.logging.log4j:log4j-core": "", + "org.apache.velocity.tools:velocity-tools-generic": "", + "org.apache.velocity:velocity-engine-core": "", + "org.bouncycastle:bcpkix-jdk18on": "", + "org.bouncycastle:bcprov-jdk18on": "", + "org.bouncycastle:bcutil-jdk18on": "", + "org.eclipse.jetty:jetty-util": "", + "org.glassfish.hk2.external:javax.inject": "", + "org.glassfish.hk2:hk2-api": "", + "org.glassfish.hk2:hk2-locator": "", + "org.glassfish.hk2:hk2-utils": "", + "org.glassfish.jaxb:jaxb-runtime": "", + "org.glassfish.jersey.bundles.repackaged:jersey-guava": "", + "org.glassfish.jersey.core:jersey-client": "", + "org.glassfish.jersey.core:jersey-common": "", + "org.glassfish.jersey.ext:jersey-proxy-client": "", + "org.glassfish.jersey.media:jersey-media-multipart": "", + "org.javassist:javassist": "", + "org.jvnet.mimepull:mimepull": "", + "org.mozilla:rhino": "", + "org.quartz-scheduler:quartz": "", + "org.reflections:reflections": "", + "org.slf4j:slf4j-api": "", + "org.slf4j:slf4j-log4j12": "", + "org.swinglabs:swingx-core": { + "dir": "", + "file": "swingx-core-1.6.2.jar" + }, + "software.amazon.awssdk:regions": "", + "software.amazon.awssdk:utils": "", + "xpp3:xpp3": "" + }, + "command": { + "com.fasterxml.jackson.core:jackson-annotations": "", + "com.fasterxml.jackson.core:jackson-core": "", + "com.fasterxml.jackson.core:jackson-databind": "", + "com.google.guava:guava": "", + "com.sun.activation:jakarta.activation": "", + "com.thoughtworks.xstream:xstream": "", + "commons-beanutils:commons-beanutils": "", + "commons-cli:commons-cli": "", + "commons-codec:commons-codec": "", + "commons-io:commons-io": "", + "commons-logging:commons-logging": "", + "de.odysseus.staxon:staxon": "", + "io.swagger.core.v3:swagger-annotations": "", + "javax.activation:javax.activation-api": "", + "javax.annotation:javax.annotation-api": "", + "javax.ws.rs:javax.ws.rs-api": "", + "javax.xml.bind:jaxb-api": "", + "org.apache.commons:commons-collections4": "", + "org.apache.commons:commons-configuration2": "", + "org.apache.commons:commons-lang3": "", + "org.apache.commons:commons-pool2": "", + "org.apache.commons:commons-text": "", + "org.apache.commons:commons-vfs2": "", + "org.apache.httpcomponents:httpclient": "", + "org.apache.httpcomponents:httpcore": "", + "org.apache.httpcomponents:httpmime": "", + "org.apache.logging.log4j:log4j-api": "", + "org.apache.logging.log4j:log4j-core": "", + "org.apache.velocity.tools:velocity-tools-generic": "", + "org.apache.velocity:velocity-engine-core": "", + "org.bouncycastle:bcpkix-jdk18on": "", + "org.bouncycastle:bcprov-jdk18on": "", + "org.bouncycastle:bcutil-jdk18on": "", + "org.eclipse.jetty:jetty-util": "", + "org.glassfish.hk2.external:javax.inject": "", + "org.glassfish.hk2:hk2-api": "", + "org.glassfish.hk2:hk2-locator": "", + "org.glassfish.hk2:hk2-utils": "", + "org.glassfish.jaxb:jaxb-runtime": "", + "org.glassfish.jersey.bundles.repackaged:jersey-guava": "", + "org.glassfish.jersey.core:jersey-client": "", + "org.glassfish.jersey.core:jersey-common": "", + "org.glassfish.jersey.ext:jersey-proxy-client": "", + "org.glassfish.jersey.media:jersey-media-multipart": "", + "org.javassist:javassist": "", + "org.jvnet.mimepull:mimepull": "", + "org.mozilla:rhino": "", + "org.reflections:reflections": "", + "org.slf4j:slf4j-api": "", + "org.slf4j:slf4j-log4j12": "", + "xpp3:xpp3": "" + }, + "donkey": { + "com.google.code.findbugs:jsr305": "guava", + "com.google.errorprone:error_prone_annotations": "guava", + "com.google.guava:failureaccess": "guava", + "com.google.guava:guava": "guava", + "com.google.guava:listenablefuture": "guava", + "com.google.inject:guice": "", + "com.google.j2objc:j2objc-annotations": "guava", + "com.microsoft.sqlserver:mssql-jdbc": "database", + "com.mysql:mysql-connector-j": "database", + "com.oracle.database.jdbc:ojdbc8": "database", + "com.thoughtworks.xstream:xstream": "xstream", + "com.zaxxer:HikariCP": "", + "commons-beanutils:commons-beanutils": "commons", + "commons-codec:commons-codec": "commons", + "commons-dbutils:commons-dbutils": "commons", + "commons-io:commons-io": "commons", + "commons-logging:commons-logging": "commons", + "org.apache.commons:commons-collections4": "commons", + "org.apache.commons:commons-dbcp2": "commons", + "org.apache.commons:commons-lang3": "commons", + "org.apache.commons:commons-math3": "commons", + "org.apache.commons:commons-pool2": "commons", + "org.apache.commons:commons-text": "commons", + "org.apache.derby:derby": "database", + "org.apache.logging.log4j:log4j-1.2-api": "", + "org.apache.logging.log4j:log4j-api": "", + "org.apache.logging.log4j:log4j-core": "", + "org.checkerframework:checker-qual": "guava", + "org.javassist:javassist": "", + "org.postgresql:postgresql": "database", + "org.quartz-scheduler:quartz": "", + "org.slf4j:slf4j-api": "", + "org.slf4j:slf4j-log4j12": "", + "xpp3:xpp3": "xstream" + }, + "generator": { + "commons-io:commons-io": "", + "org.apache.commons:commons-collections4": "", + "org.apache.commons:commons-lang3": "", + "org.apache.logging.log4j:log4j-1.2-api": "", + "org.apache.logging.log4j:log4j-api": "", + "org.apache.logging.log4j:log4j-core": "", + "org.apache.velocity:velocity-engine-core": "", + "org.slf4j:slf4j-api": "", + "org.slf4j:slf4j-log4j12": "" + }, + "server": { + "ca.uhn.hapi:hapi-structures-v27": "hapi", + "ca.uhn.hapi:hapi-structures-v28": "hapi", + "ca.uhn.hapi:hapi-structures-v281": "hapi", + "com.fasterxml.jackson.core:jackson-annotations": "jackson", + "com.fasterxml.jackson.core:jackson-core": "jackson", + "com.fasterxml.jackson.core:jackson-databind": "jackson", + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": "jackson", + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": "jackson", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": "jackson", + "com.github.mwiede:jsch": "", + "com.github.oshi:oshi-core": "", + "com.github.zafarkhaja:java-semver": "", + "com.google.inject:guice": "", + "com.microsoft.sqlserver:mssql-jdbc": "database", + "com.mysql:mysql-connector-j": "database", + "com.oracle.database.jdbc:ojdbc8": "database", + "com.sun.activation:jakarta.activation": "javax", + "com.sun.mail:jakarta.mail": "javax", + "com.sun.xml.fastinfoset:FastInfoset": "javax/jaxws/ext", + "com.sun.xml.messaging.saaj:saaj-impl": { + "dir": "javax/jaxws/ext", + "file": "saaj-impl-1.0.jar" + }, + "com.sun.xml.stream.buffer:streambuffer": "javax/jaxws/ext", + "com.sun.xml.ws:jaxws-rt": "javax/jaxws", + "com.sun.xml.ws:jaxws-tools": "javax/jaxws", + "com.sun.xml.ws:policy": "javax/jaxws/ext", + "com.thoughtworks.xstream:xstream": "", + "com.typesafe.netty:netty-reactive-streams": "aws/ext/netty", + "com.typesafe.netty:netty-reactive-streams-http": "aws/ext/netty", + "com.zaxxer:HikariCP": "", + "commons-beanutils:commons-beanutils": "commons", + "commons-cli:commons-cli": "commons", + "commons-codec:commons-codec": "commons", + "commons-collections:commons-collections": "commons", + "commons-dbutils:commons-dbutils": "commons", + "commons-el:commons-el": "commons", + "commons-fileupload:commons-fileupload": "commons", + "commons-httpclient:commons-httpclient": "commons", + "commons-io:commons-io": "commons", + "commons-jxpath:commons-jxpath": "commons", + "commons-logging:commons-logging": "commons", + "commons-net:commons-net": "commons", + "de.odysseus.staxon:staxon": "", + "io.github.classgraph:classgraph": "", + "io.netty:netty-buffer": "aws/ext/netty", + "io.netty:netty-codec": "aws/ext/netty", + "io.netty:netty-codec-http": "aws/ext/netty", + "io.netty:netty-codec-http2": "aws/ext/netty", + "io.netty:netty-common": "aws/ext/netty", + "io.netty:netty-handler": "aws/ext/netty", + "io.netty:netty-resolver": "aws/ext/netty", + "io.netty:netty-transport": "aws/ext/netty", + "io.netty:netty-transport-native-epoll": "aws/ext/netty", + "io.netty:netty-transport-native-unix-common": "aws/ext/netty", + "io.swagger.core.v3:swagger-annotations": "swagger", + "io.swagger.core.v3:swagger-core": "swagger", + "io.swagger.core.v3:swagger-integration": "swagger", + "io.swagger.core.v3:swagger-jaxrs2": "swagger", + "io.swagger.core.v3:swagger-jaxrs2-servlet-initializer": "swagger", + "io.swagger.core.v3:swagger-models": "swagger", + "javax.activation:javax.activation-api": "javax", + "javax.annotation:javax.annotation-api": "javax", + "javax.json:javax.json-api": "javax", + "javax.jws:jsr181-api": { + "dir": "javax/jaxws/ext", + "file": "jsr181-api-1.0.jar" + }, + "javax.persistence:persistence-api": "jersey/ext", + "javax.servlet:javax.servlet-api": "javax", + "javax.validation:validation-api": "jersey/ext", + "javax.ws.rs:javax.ws.rs-api": "javax", + "javax.xml.bind:jaxb-api": "javax/jaxb", + "javax.xml.soap:javax.xml.soap-api": "javax/jaxws", + "javax.xml.ws:jaxws-api": "javax/jaxws", + "joda-time:joda-time": "", + "net.java.dev.jna:jna": "", + "net.java.dev.jna:jna-platform": "", + "org.apache.commons:commons-collections4": "commons", + "org.apache.commons:commons-compress": "commons", + "org.apache.commons:commons-configuration2": "commons", + "org.apache.commons:commons-dbcp2": "commons", + "org.apache.commons:commons-digester3": "commons", + "org.apache.commons:commons-email": "commons", + "org.apache.commons:commons-lang3": "commons", + "org.apache.commons:commons-math3": "commons", + "org.apache.commons:commons-pool2": "commons", + "org.apache.commons:commons-text": "commons", + "org.apache.commons:commons-vfs2": "commons", + "org.apache.derby:derby": "database", + "org.apache.derby:derbytools": "database", + "org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec": "jms", + "org.apache.geronimo.specs:geronimo-jms_1.1_spec": "jms", + "org.apache.httpcomponents:httpclient": "commons", + "org.apache.httpcomponents:httpcore": "commons", + "org.apache.httpcomponents:httpmime": "commons", + "org.apache.logging.log4j:log4j-1.2-api": "log4j", + "org.apache.logging.log4j:log4j-api": "log4j", + "org.apache.logging.log4j:log4j-core": "log4j", + "org.apache.taglibs:taglibs-standard-impl": { + "dir": "jetty/jsp", + "file": "org.apache.taglibs.taglibs-standard-impl-1.2.5.jar" + }, + "org.apache.taglibs:taglibs-standard-spec": { + "dir": "jetty/jsp", + "file": "org.apache.taglibs.taglibs-standard-spec-1.2.5.jar" + }, + "org.apache.velocity.tools:velocity-tools-generic": "", + "org.apache.velocity:velocity-engine-core": "", + "org.bouncycastle:bcpkix-jdk18on": "", + "org.bouncycastle:bcprov-jdk18on": "", + "org.bouncycastle:bcutil-jdk18on": "", + "org.eclipse.jdt:ecj": { + "dir": "jetty/jsp", + "file": "org.eclipse.jdt.ecj-3.19.0.jar" + }, + "org.eclipse.jetty.toolchain:jetty-schemas": "jetty", + "org.eclipse.jetty:apache-jsp": "jetty/jsp", + "org.eclipse.jetty:jetty-annotations": "jetty", + "org.eclipse.jetty:jetty-continuation": "jetty", + "org.eclipse.jetty:jetty-http": "jetty", + "org.eclipse.jetty:jetty-io": "jetty", + "org.eclipse.jetty:jetty-jndi": "jetty", + "org.eclipse.jetty:jetty-plus": "jetty", + "org.eclipse.jetty:jetty-rewrite": "jetty", + "org.eclipse.jetty:jetty-security": "jetty", + "org.eclipse.jetty:jetty-server": "jetty", + "org.eclipse.jetty:jetty-servlet": "jetty", + "org.eclipse.jetty:jetty-util": "jetty", + "org.eclipse.jetty:jetty-util-ajax": "jetty", + "org.eclipse.jetty:jetty-webapp": "jetty", + "org.eclipse.jetty:jetty-xml": "jetty", + "org.glassfish.external:management-api": { + "dir": "javax/jaxws/ext", + "file": "management-api-3.2.1.b001.jar" + }, + "org.glassfish.gmbal:gmbal-api-only": { + "dir": "javax/jaxws/ext", + "file": "gmbal-api-only-3.1.0.b001.jar" + }, + "org.glassfish.ha:ha-api": "javax/jaxws/ext", + "org.glassfish.hk2.external:aopalliance-repackaged": "jersey/ext", + "org.glassfish.hk2.external:javax.inject": "javax", + "org.glassfish.hk2:hk2-api": "jersey/ext", + "org.glassfish.hk2:hk2-locator": "jersey/ext", + "org.glassfish.hk2:hk2-utils": "jersey/ext", + "org.glassfish.hk2:osgi-resource-locator": "jersey/ext", + "org.glassfish.jaxb:jaxb-runtime": "javax/jaxb", + "org.glassfish.jaxb:txw2": "javax/jaxb/ext", + "org.glassfish.jersey.bundles.repackaged:jersey-guava": "jersey", + "org.glassfish.jersey.containers:jersey-container-jetty-http": "jersey", + "org.glassfish.jersey.containers:jersey-container-jetty-servlet": "jersey", + "org.glassfish.jersey.containers:jersey-container-servlet": "jersey", + "org.glassfish.jersey.containers:jersey-container-servlet-core": "jersey", + "org.glassfish.jersey.core:jersey-client": "jersey", + "org.glassfish.jersey.core:jersey-common": "jersey", + "org.glassfish.jersey.core:jersey-server": "jersey", + "org.glassfish.jersey.ext:jersey-proxy-client": "jersey", + "org.glassfish.jersey.media:jersey-media-jaxb": "jersey", + "org.glassfish.jersey.media:jersey-media-multipart": "jersey", + "org.glassfish:javax.json": "javax", + "org.javassist:javassist": "", + "org.jdom:jdom2": "", + "org.jvnet.mimepull:mimepull": "javax/jaxws/ext", + "org.jvnet.staxex:stax-ex": "javax/jaxws/ext", + "org.mortbay.jasper:apache-el": { + "dir": "jetty/jsp", + "file": "org.mortbay.jasper.apache-el-8.5.70.jar" + }, + "org.mortbay.jasper:apache-jsp": { + "dir": "jetty/jsp", + "file": "org.mortbay.jasper.apache-jsp-8.5.70.jar" + }, + "org.mozilla:rhino": "", + "org.mybatis:mybatis": "", + "org.osgi:org.osgi.core": "jersey/ext", + "org.ow2.asm:asm": "jersey/ext", + "org.ow2.asm:asm-analysis": "jersey/ext", + "org.ow2.asm:asm-commons": "jersey/ext", + "org.ow2.asm:asm-tree": "jersey/ext", + "org.ow2.asm:asm-util": "jersey/ext", + "org.postgresql:postgresql": "database", + "org.quartz-scheduler:quartz": "", + "org.reactivestreams:reactive-streams": "aws/ext", + "org.reflections:reflections": "swagger/ext", + "org.yaml:snakeyaml": "jackson", + "software.amazon.awssdk:annotations": "aws", + "software.amazon.awssdk:apache-client": "aws", + "software.amazon.awssdk:auth": "aws", + "software.amazon.awssdk:aws-core": "aws", + "software.amazon.awssdk:aws-json-protocol": "aws", + "software.amazon.awssdk:aws-query-protocol": "aws", + "software.amazon.awssdk:aws-xml-protocol": "aws", + "software.amazon.awssdk:http-client-spi": "aws", + "software.amazon.awssdk:kms": "aws", + "software.amazon.awssdk:metrics-spi": "aws", + "software.amazon.awssdk:netty-nio-client": "aws/ext/netty", + "software.amazon.awssdk:profiles": "aws", + "software.amazon.awssdk:protocol-core": "aws", + "software.amazon.awssdk:regions": "aws", + "software.amazon.awssdk:s3": "aws", + "software.amazon.awssdk:sdk-core": "aws", + "software.amazon.awssdk:sts": "aws", + "software.amazon.awssdk:utils": "aws", + "software.amazon.eventstream:eventstream": "aws", + "xpp3:xpp3": "" + }, + "server-extensions": { + "com.lowagie:itext": "extensions/doc", + "com.lowagie:itext-rtf": "extensions/doc", + "com.openhtmltopdf:openhtmltopdf-core": "extensions/doc", + "com.openhtmltopdf:openhtmltopdf-pdfbox": "extensions/doc", + "de.rototor.pdfbox:graphics2d": "extensions/doc", + "eu.agno3.jcifs:jcifs-ng": "extensions/file", + "gov.nih.imagej:imagej": { + "dir": "extensions/dicomviewer", + "file": "ij.jar" + }, + "org.apache.pdfbox:fontbox": "extensions/doc", + "org.apache.pdfbox:pdfbox": "extensions/doc", + "org.apache.pdfbox:xmpbox": "extensions/doc", + "org.xhtmlrenderer:flying-saucer-core": "extensions/doc", + "org.xhtmlrenderer:flying-saucer-pdf": "extensions/doc" + } +} \ No newline at end of file diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml new file mode 100644 index 0000000000..6c71604422 --- /dev/null +++ b/gradle/verification-metadata.xml @@ -0,0 +1,3444 @@ + + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..1b33c55baa 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..9128c7d428 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-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..23d15a9367 --- /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="\\\"\\\"" + + +# 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..db3a6ac207 --- /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= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/server/.classpath b/server/.classpath deleted file mode 100644 index f78b10f528..0000000000 --- a/server/.classpath +++ /dev/null @@ -1,273 +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/Mirth Connect Server.launch b/server/Mirth Connect Server.launch deleted file mode 100644 index c8f327cd3f..0000000000 --- a/server/Mirth Connect Server.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - 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..eaa2ae6eac --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,961 @@ +// The OIE server. Compiles the server source, builds the core jars +// (mirth-crypto, mirth-client-core, mirth-server, launcher, dbconf), +// builds every connector/plugin extension into build/extensions, +// assembles the distribution in setup/, and zips extensions into dist/ +// (mirrors server/build.xml). + +import java.text.SimpleDateFormat + +dependencies { + implementation libs.bundles.server.main + implementation libs.bundles.server.extensions + // classified artifact; version catalogs cannot express classifiers + implementation 'io.netty:netty-transport-native-epoll:4.1.119.Final:linux-x86_64' + testImplementation libs.bundles.server.test +} + +// --------------------------------------------------------------------- +// Compilation +// --------------------------------------------------------------------- + +// build-donkey in mirth-build.xml: refresh lib/donkey from the donkey +// module. Sources donkey's staged setup/lib, which reassembles the full +// historical lib layout from vendored leftovers + resolved artifacts. +def syncDonkeyLibs = tasks.register('syncDonkeyLibs', Sync) { + description = 'Copies donkey jars and libs into server/lib/donkey.' + into 'lib/donkey' + from rootProject.file('donkey/setup/donkey-model.jar') + from rootProject.file('donkey/setup/donkey-server.jar') + from(rootProject.file('donkey/setup/lib')) { + exclude 'log4j-1.2.16.jar' + exclude 'HikariCP-java6-2.0.1.jar' + exclude 'javassist-3.19.0-GA.jar' + exclude 'xstream/**' + exclude 'commons/**' + exclude 'database/**' + } + dependsOn ':donkey:donkeyModelJar', ':donkey:donkeyServerJar', ':donkey:copySetupLibs' +} + +compileJava.dependsOn syncDonkeyLibs + +compileTestJava { + options.compilerArgs += [ + '--add-modules=java.sql.rowset', + '--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED', + '--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED', + '--add-exports=java.base/sun.security.provider=ALL-UNNAMED', + ] +} + + +def generateVersionProperties = tasks.register('generateVersionProperties') { + description = 'Generates version.properties (embedded in mirth-client-core.jar).' + def outFile = file('version.properties') + inputs.property 'version', version + // the date must be computed at execution time, not when the daemon + // happened to configure the project + inputs.property 'date', project.providers.provider { + new SimpleDateFormat('MMMM d, yyyy', Locale.US).format(new Date()) + } + outputs.file outFile + doLast { + def buildDate = new SimpleDateFormat('MMMM d, yyyy', Locale.US).format(new Date()) + outFile.text = "mirth.version=${version}\nmirth.date=${buildDate}\n" + } +} + +// --------------------------------------------------------------------- +// Core jars +// --------------------------------------------------------------------- + +def cryptoJar = tasks.register('cryptoJar', Jar) { + archiveFileName = 'mirth-crypto.jar' + destinationDirectory = file('setup/server-lib') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/commons/encryption/**' + } +} + +def clientCoreJar = tasks.register('clientCoreJar', Jar) { + archiveFileName = 'mirth-client-core.jar' + destinationDirectory = file('setup/server-lib') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/client/core/**' + include 'com/mirth/connect/model/**' + include 'org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReader.class' + 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/**' + include 'org/glassfish/jersey/**' + include 'de/**' + include 'net/lingala/zip4j/unzip/**' + } + from generateVersionProperties + from('src/main/resources/com/mirth/connect/util') { + include '*.js' + include '*.txt' + into 'com/mirth/connect/util' + } +} + +// --------------------------------------------------------------------- +// Extensions (connectors, datatypes, plugins) -> build/extensions +// --------------------------------------------------------------------- + +// Faithful transcription of the include/exclude lists in server/build.xml. +// shared/server == null means that extension ships no such jar. +def serverExtensions = [ + [name: 'dicom', pkg: 'com/mirth/connect/connectors/dimse', lib: 'dimse', + shared: [includes: ['com/mirth/connect/connectors/dimse/DICOMReceiverProperties.class', + 'com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.class']], + server: [includes: ['com/mirth/connect/connectors/dimse/**', 'org/dcm4che2/**'], + excludes: ['com/mirth/connect/connectors/dimse/DICOMReceiverProperties.class', + 'com/mirth/connect/connectors/dimse/DICOMDispatcherProperties.class']]], + + [name: 'doc', pkg: 'com/mirth/connect/connectors/doc', lib: 'doc', + shared: [includes: ['com/mirth/connect/connectors/doc/DocumentDispatcherProperties.class', + 'com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.class', + 'com/mirth/connect/connectors/doc/PageSize.class', + 'com/mirth/connect/connectors/doc/Unit.class']], + server: [includes: ['com/mirth/connect/connectors/doc/**'], + excludes: ['com/mirth/connect/connectors/doc/DocumentDispatcherProperties.class', + 'com/mirth/connect/connectors/doc/DocumentConnectorServletInterface.class', + 'com/mirth/connect/connectors/doc/PageSize.class', + 'com/mirth/connect/connectors/doc/Unit.class']]], + + [name: 'file', pkg: 'com/mirth/connect/connectors/file', lib: 'file', + shared: [includes: ['com/mirth/connect/connectors/file/SchemeProperties.class', + 'com/mirth/connect/connectors/file/FTPSchemeProperties.class', + 'com/mirth/connect/connectors/file/SmbDialectVersion.class', + 'com/mirth/connect/connectors/file/SmbSchemeProperties.class', + 'com/mirth/connect/connectors/file/SftpSchemeProperties.class', + 'com/mirth/connect/connectors/file/S3SchemeProperties.class', + 'com/mirth/connect/connectors/file/FileReceiverProperties.class', + 'com/mirth/connect/connectors/file/FileDispatcherProperties.class', + 'com/mirth/connect/connectors/file/FileScheme.class', + 'com/mirth/connect/connectors/file/FileAction.class', + 'com/mirth/connect/connectors/file/FileConnectorServletInterface.class']], + // Note: the Ant build does not exclude the Smb* classes from the + // server jar, so they appear in both jars. Kept as-is. + server: [includes: ['com/mirth/connect/connectors/file/**'], + excludes: ['com/mirth/connect/connectors/file/SchemeProperties.class', + 'com/mirth/connect/connectors/file/FTPSchemeProperties.class', + 'com/mirth/connect/connectors/file/SftpSchemeProperties.class', + 'com/mirth/connect/connectors/file/S3SchemeProperties.class', + 'com/mirth/connect/connectors/file/FileReceiverProperties.class', + 'com/mirth/connect/connectors/file/FileDispatcherProperties.class', + 'com/mirth/connect/connectors/file/FileScheme.class', + 'com/mirth/connect/connectors/file/FileAction.class', + 'com/mirth/connect/connectors/file/FileConnectorServletInterface.class']]], + + [name: 'http', pkg: 'com/mirth/connect/connectors/http', lib: 'http', + shared: [includes: ['com/mirth/connect/connectors/http/HttpReceiverProperties.class', + 'com/mirth/connect/connectors/http/HttpDispatcherProperties.class', + 'com/mirth/connect/connectors/http/HttpStaticResource.class', + 'com/mirth/connect/connectors/http/HttpStaticResource$ResourceType.class', + 'com/mirth/connect/connectors/http/HttpConnectorServletInterface.class']], + server: [includes: ['com/mirth/connect/connectors/http/**'], + excludes: ['com/mirth/connect/connectors/http/HttpReceiverProperties.class', + 'com/mirth/connect/connectors/http/HttpDispatcherProperties.class', + 'com/mirth/connect/connectors/http/HttpStaticResource.class', + 'com/mirth/connect/connectors/http/HttpStaticResource$ResourceType.class', + 'com/mirth/connect/connectors/http/HttpConnectorServletInterface.class']]], + + [name: 'jdbc', pkg: 'com/mirth/connect/connectors/jdbc', lib: 'jdbc', + shared: [includes: ['com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.class', + 'com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.class', + 'com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.class', + 'com/mirth/connect/connectors/jdbc/Table.class', + 'com/mirth/connect/connectors/jdbc/Column.class', + 'com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.class']], + server: [includes: ['com/mirth/connect/connectors/jdbc/**'], + excludes: ['com/mirth/connect/connectors/jdbc/DatabaseReceiverProperties.class', + 'com/mirth/connect/connectors/jdbc/DatabaseDispatcherProperties.class', + 'com/mirth/connect/connectors/jdbc/DatabaseConnectionInfo.class', + 'com/mirth/connect/connectors/jdbc/Table.class', + 'com/mirth/connect/connectors/jdbc/Column.class', + 'com/mirth/connect/connectors/jdbc/DatabaseConnectorServletInterface.class']]], + + [name: 'jms', pkg: 'com/mirth/connect/connectors/jms', lib: 'jms', + shared: [includes: ['com/mirth/connect/connectors/jms/JmsConnectorProperties.class', + 'com/mirth/connect/connectors/jms/JmsReceiverProperties.class', + 'com/mirth/connect/connectors/jms/JmsDispatcherProperties.class', + 'com/mirth/connect/connectors/jms/JmsConnectorServletInterface.class']], + server: [includes: ['com/mirth/connect/connectors/jms/**'], + excludes: ['com/mirth/connect/connectors/jms/JmsConnectorProperties.class', + 'com/mirth/connect/connectors/jms/JmsReceiverProperties.class', + 'com/mirth/connect/connectors/jms/JmsDispatcherProperties.class', + 'com/mirth/connect/connectors/jms/JmsConnectorServletInterface.class']]], + + [name: 'js', pkg: 'com/mirth/connect/connectors/js', lib: 'js', + shared: [includes: ['com/mirth/connect/connectors/js/JavaScriptReceiverProperties.class', + 'com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.class']], + server: [includes: ['com/mirth/connect/connectors/js/**'], + excludes: ['com/mirth/connect/connectors/js/JavaScriptReceiverProperties.class', + 'com/mirth/connect/connectors/js/JavaScriptDispatcherProperties.class']]], + + [name: 'smtp', pkg: 'com/mirth/connect/connectors/smtp', lib: 'smtp', + shared: [includes: ['com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.class', + 'com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.class', + 'com/mirth/connect/connectors/smtp/Attachment.class']], + server: [includes: ['com/mirth/connect/connectors/smtp/**'], + excludes: ['com/mirth/connect/connectors/smtp/SmtpDispatcherProperties.class', + 'com/mirth/connect/connectors/smtp/SmtpConnectorServletInterface.class', + 'com/mirth/connect/connectors/smtp/Attachment.class']]], + + [name: 'tcp', pkg: 'com/mirth/connect/connectors/tcp', lib: 'tcp', + shared: [includes: ['com/mirth/connect/connectors/tcp/TcpReceiverProperties.class', + 'com/mirth/connect/connectors/tcp/TcpDispatcherProperties.class', + 'com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.class']], + server: [includes: ['com/mirth/connect/connectors/tcp/**'], + excludes: ['com/mirth/connect/connectors/tcp/TcpReceiverProperties.class', + 'com/mirth/connect/connectors/tcp/TcpDispatcherProperties.class', + 'com/mirth/connect/connectors/tcp/TcpConnectorServletInterface.class']]], + + [name: 'vm', pkg: 'com/mirth/connect/connectors/vm', lib: 'vm', + shared: [includes: ['com/mirth/connect/connectors/vm/VmReceiverProperties.class', + 'com/mirth/connect/connectors/vm/VmDispatcherProperties.class']], + server: [includes: ['com/mirth/connect/connectors/vm/**'], + excludes: ['com/mirth/connect/connectors/vm/VmReceiverProperties.class', + 'com/mirth/connect/connectors/vm/VmDispatcherProperties.class']]], + + [name: 'ws', pkg: 'com/mirth/connect/connectors/ws', lib: 'ws', + shared: [includes: ['com/mirth/connect/connectors/ws/Binding.class', + 'com/mirth/connect/connectors/ws/WebServiceReceiverProperties.class', + 'com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap$DefinitionPortMap.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap$PortInformation.class', + 'com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.class']], + server: [includes: ['com/mirth/connect/connectors/ws/**'], + excludes: ['com/mirth/connect/connectors/ws/Binding.class', + 'com/mirth/connect/connectors/ws/WebServiceReceiverProperties.class', + 'com/mirth/connect/connectors/ws/WebServiceDispatcherProperties.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap$DefinitionPortMap.class', + 'com/mirth/connect/connectors/ws/DefinitionServiceMap$PortInformation.class', + 'com/mirth/connect/connectors/ws/WebServiceConnectorServletInterface.class']]], + + // datatypes: shared = the package minus the server-side classes + [name: 'datatype-delimited', pkg: 'com/mirth/connect/plugins/datatypes/delimited', lib: 'datatypes/delimited', + shared: [includes: ['com/mirth/connect/plugins/datatypes/delimited/**'], + excludes: ['com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.class', + 'com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.class', + 'com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchReader.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/delimited/DelimitedDataTypeServerPlugin.class', + 'com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchAdaptor.class', + 'com/mirth/connect/plugins/datatypes/delimited/DelimitedBatchReader.class']]], + + [name: 'datatype-dicom', pkg: 'com/mirth/connect/plugins/datatypes/dicom', lib: 'datatypes/dicom', + shared: [includes: ['com/mirth/connect/plugins/datatypes/dicom/**'], + excludes: ['com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/dicom/DICOMDataTypeServerPlugin.class']]], + + [name: 'datatype-edi', pkg: 'com/mirth/connect/plugins/datatypes/edi', lib: 'datatypes/edi', + shared: [includes: ['com/mirth/connect/plugins/datatypes/edi/**'], + excludes: ['com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/edi/EDIDataTypeServerPlugin.class']]], + + [name: 'datatype-hl7v2', pkg: 'com/mirth/connect/plugins/datatypes/hl7v2', lib: 'datatypes/hl7v2', + shared: [includes: ['com/mirth/connect/plugins/datatypes/hl7v2/**'], + excludes: ['com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.class', + 'com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchAdaptor.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/hl7v2/HL7v2DataTypeServerPlugin.class', + 'com/mirth/connect/plugins/datatypes/hl7v2/HL7v2BatchAdaptor.class']]], + + [name: 'datatype-hl7v3', pkg: 'com/mirth/connect/plugins/datatypes/hl7v3', lib: 'datatypes/hl7v3', + shared: [includes: ['com/mirth/connect/plugins/datatypes/hl7v3/**'], + excludes: ['com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/hl7v3/HL7V3DataTypeServerPlugin.class']]], + + [name: 'datatype-ncpdp', pkg: 'com/mirth/connect/plugins/datatypes/ncpdp', lib: 'datatypes/ncpdp', + shared: [includes: ['com/mirth/connect/plugins/datatypes/ncpdp/**'], + excludes: ['com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/ncpdp/NCPDPDataTypeServerPlugin.class']]], + + [name: 'datatype-xml', pkg: 'com/mirth/connect/plugins/datatypes/xml', lib: 'datatypes/xml', + shared: [includes: ['com/mirth/connect/plugins/datatypes/xml/**'], + excludes: ['com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/xml/XMLDataTypeServerPlugin.class']]], + + [name: 'datatype-raw', pkg: 'com/mirth/connect/plugins/datatypes/raw', lib: 'datatypes/raw', + shared: [includes: ['com/mirth/connect/plugins/datatypes/raw/**'], + excludes: ['com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/raw/RawDataTypeServerPlugin.class']]], + + [name: 'datatype-json', pkg: 'com/mirth/connect/plugins/datatypes/json', lib: 'datatypes/json', + shared: [includes: ['com/mirth/connect/plugins/datatypes/json/**'], + excludes: ['com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.class']], + server: [includes: ['com/mirth/connect/plugins/datatypes/json/JSONDataTypeServerPlugin.class']]], + + // plugins + [name: 'directoryresource', pkg: 'com/mirth/connect/plugins/directoryresource', lib: 'directoryresource', + shared: [includes: ['com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.class', + 'com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.class']], + server: [includes: ['com/mirth/connect/plugins/directoryresource/**'], + excludes: ['com/mirth/connect/plugins/directoryresource/DirectoryResourceProperties.class', + 'com/mirth/connect/plugins/directoryresource/DirectoryResourceServletInterface.class']]], + + [name: 'dashboardstatus', pkg: 'com/mirth/connect/plugins/dashboardstatus', lib: 'dashboardstatus', + shared: [includes: ['com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.class', + 'com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.class']], + server: [includes: ['com/mirth/connect/plugins/dashboardstatus/**'], + excludes: ['com/mirth/connect/plugins/dashboardstatus/ConnectionLogItem.class', + 'com/mirth/connect/plugins/dashboardstatus/DashboardConnectorStatusServletInterface.class']]], + + [name: 'destinationsetfilter', pkg: 'com/mirth/connect/plugins/destinationsetfilter', lib: 'destinationsetfilter', + shared: [includes: ['com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep.class', + 'com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep$Behavior.class', + 'com/mirth/connect/plugins/destinationsetfilter/DestinationSetFilterStep$Condition.class']], + server: null], + + [name: 'dicomviewer', pkg: 'com/mirth/connect/plugins/dicomviewer', lib: 'dicomviewer', + shared: null, server: null], + + [name: 'globalmapviewer', pkg: 'com/mirth/connect/plugins/globalmapviewer', lib: 'globalmapviewer', + shared: [includes: ['com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.class']], + server: [includes: ['com/mirth/connect/plugins/globalmapviewer/**'], + excludes: ['com/mirth/connect/plugins/globalmapviewer/GlobalMapServletInterface.class']]], + + [name: 'httpauth', pkg: 'com/mirth/connect/plugins/httpauth', lib: 'httpauth', + shared: [includes: ['com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.class', + 'com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties$AuthType.class', + 'com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties$Algorithm.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties$QOPMode.class', + 'com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties$TokenLocation.class']], + server: [includes: ['com/mirth/connect/plugins/httpauth/**'], + excludes: ['com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties.class', + 'com/mirth/connect/plugins/httpauth/HttpAuthConnectorPluginProperties$AuthType.class', + 'com/mirth/connect/plugins/httpauth/NoneHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/basic/BasicHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties$Algorithm.class', + 'com/mirth/connect/plugins/httpauth/digest/DigestHttpAuthProperties$QOPMode.class', + 'com/mirth/connect/plugins/httpauth/custom/CustomHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/javascript/JavaScriptHttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties.class', + 'com/mirth/connect/plugins/httpauth/oauth2/OAuth2HttpAuthProperties$TokenLocation.class']]], + + [name: 'imageviewer', pkg: 'com/mirth/connect/plugins/imageviewer', lib: 'imageviewer', + shared: null, server: null], + + [name: 'javascriptrule', pkg: 'com/mirth/connect/plugins/javascriptrule', lib: 'javascriptrule', + shared: [includes: ['com/mirth/connect/plugins/javascriptrule/JavaScriptRule.class']], + server: null], + + [name: 'javascriptstep', pkg: 'com/mirth/connect/plugins/javascriptstep', lib: 'javascriptstep', + shared: [includes: ['com/mirth/connect/plugins/javascriptstep/JavaScriptStep.class']], + server: null], + + [name: 'mapper', pkg: 'com/mirth/connect/plugins/mapper', lib: 'mapper', + shared: [includes: ['com/mirth/connect/plugins/mapper/MapperStep.class', + 'com/mirth/connect/plugins/mapper/MapperStep$Scope.class']], + server: null], + + [name: 'messagebuilder', pkg: 'com/mirth/connect/plugins/messagebuilder', lib: 'messagebuilder', + shared: [includes: ['com/mirth/connect/plugins/messagebuilder/MessageBuilderStep.class']], + server: null], + + [name: 'datapruner', pkg: 'com/mirth/connect/plugins/datapruner', lib: 'datapruner', + shared: [includes: ['com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.class']], + server: [includes: ['com/mirth/connect/plugins/datapruner/**'], + excludes: ['com/mirth/connect/plugins/datapruner/DataPrunerServletInterface.class']]], + + [name: 'mllpmode', pkg: 'com/mirth/connect/plugins/mllpmode', lib: 'mllpmode', + shared: [includes: ['com/mirth/connect/plugins/mllpmode/MLLPModeProperties.class']], + server: [includes: ['com/mirth/connect/plugins/mllpmode/**'], + excludes: ['com/mirth/connect/plugins/mllpmode/MLLPModeProperties.class']]], + + [name: 'pdfviewer', pkg: 'com/mirth/connect/plugins/pdfviewer', lib: 'pdfviewer', + shared: null, server: null], + + [name: 'textviewer', pkg: 'com/mirth/connect/plugins/textviewer', lib: 'textviewer', + shared: null, server: null], + + [name: 'rulebuilder', pkg: 'com/mirth/connect/plugins/rulebuilder', lib: 'rulebuilder', + shared: [includes: ['com/mirth/connect/plugins/rulebuilder/RuleBuilderRule.class', + 'com/mirth/connect/plugins/rulebuilder/RuleBuilderRule$Condition.class']], + server: null], + + [name: 'serverlog', pkg: 'com/mirth/connect/plugins/serverlog', lib: 'serverlog', + shared: [includes: ['com/mirth/connect/plugins/serverlog/ServerLogItem.class', + 'com/mirth/connect/plugins/serverlog/ServerLogServletInterface.class']], + server: [includes: ['com/mirth/connect/plugins/serverlog/**'], + excludes: ['com/mirth/connect/plugins/serverlog/ServerLogItem.class', + 'com/mirth/connect/plugins/serverlog/ServerLogServletInterface.class']]], + + [name: 'scriptfilerule', pkg: 'com/mirth/connect/plugins/scriptfilerule', lib: 'scriptfilerule', + shared: [includes: ['com/mirth/connect/plugins/scriptfilerule/ExternalScriptRule.class']], + server: null], + + [name: 'scriptfilestep', pkg: 'com/mirth/connect/plugins/scriptfilestep', lib: 'scriptfilestep', + shared: [includes: ['com/mirth/connect/plugins/scriptfilestep/ExternalScriptStep.class']], + server: null], + + [name: 'xsltstep', pkg: 'com/mirth/connect/plugins/xsltstep', lib: 'xsltstep', + shared: [includes: ['com/mirth/connect/plugins/xsltstep/XsltStep.class']], + server: null], +] + +def extensionTasks = [] +def projectVersion = version + +serverExtensions.each { extension -> + def name = extension.name + def safe = name.replace('-', '_') + def extensionDir = "build/extensions/${name}" + + extensionTasks << tasks.register("ext_${safe}_xml", Copy) { + // The replaced version is part of the output; without this input a + // version bump would leave stale @mirthversion XML on disk. + inputs.property 'version', projectVersion + from("src/main/resources/${extension.pkg}") { include '*.xml' } + into extensionDir + // In-place token replace after copying, like the Ant + // task; a content filter would normalize line endings. + doLast { + ant.replace(dir: extensionDir, includes: '*.xml', + token: '@mirthversion', value: projectVersion) + } + } + + def libPrefix = "extensions/${extension.lib}" + def extPlacements = rootProject.stagedArtifacts(configurations.runtimeClasspath, 'server-extensions', + { dir -> dir == libPrefix || dir.startsWith(libPrefix + '/') }) + extensionTasks << tasks.register("ext_${safe}_lib", Copy) { + from "lib/extensions/${extension.lib}" + from(files({ extPlacements().keySet() })) { + eachFile { it.path = extPlacements()[it.file].substring(libPrefix.length() + 1) } + includeEmptyDirs = false + } + into "${extensionDir}/lib" + } + + if (extension.shared != null) { + extensionTasks << tasks.register("ext_${safe}_sharedJar", Jar) { + archiveFileName = "${name}-shared.jar" + destinationDirectory = file(extensionDir) + from(sourceSets.main.output.classesDirs) { + include(extension.shared.includes as String[]) + exclude((extension.shared.excludes ?: []) as String[]) + } + } + } + + if (extension.server != null) { + extensionTasks << tasks.register("ext_${safe}_serverJar", Jar) { + archiveFileName = "${name}-server.jar" + destinationDirectory = file(extensionDir) + from(sourceSets.main.output.classesDirs) { + include(extension.server.includes as String[]) + exclude((extension.server.excludes ?: []) as String[]) + } + } + } +} + +// The edi xml definitions ship inside the shared jar. +tasks.named('ext_datatype_edi_sharedJar', Jar) { + from('src/main/resources/com/mirth/connect/plugins/datatypes/edi/xml') { + into 'com/mirth/connect/plugins/datatypes/edi/xml' + } +} + +// httpauth additionally ships its userutil sources. +def httpauthUserutilSourcesJar = tasks.register('httpauthUserutilSourcesJar', Jar) { + archiveFileName = 'httpauth-userutil-sources.jar' + destinationDirectory = file('build/extensions/httpauth/src') + from('src/main/java') { include 'com/mirth/connect/plugins/httpauth/userutil/**' } +} +extensionTasks << httpauthUserutilSourcesJar + +def createServerExtensions = tasks.register('createServerExtensions') { + description = 'Builds all connector/plugin extensions into build/extensions.' + dependsOn extensionTasks +} + +// --------------------------------------------------------------------- +// Javadocs (user API), part of the distributed docs +// --------------------------------------------------------------------- + +// Invokes the javadoc tool directly: the multiline -bottom argument +// (whitespace from the old build.xml CDATA block) cannot pass through +// Gradle's javadoc options file, and the generated HTML should be +// identical to the Ant build's. +def userApiJavadoc = tasks.register('userApiJavadoc') { + description = 'Generates the user API javadocs into docs/javadocs/user-api.' + def outDir = file('docs/javadocs/user-api') + inputs.files(fileTree('src/main/java') { + include 'com/mirth/connect/server/userutil/**' + include 'com/mirth/connect/userutil/**' + include 'com/mirth/connect/plugins/httpauth/userutil/**' + }) + outputs.dir outDir + dependsOn syncDonkeyLibs + doLast { + outDir.mkdirs() + def cmd = [new File(System.getProperty('java.home'), 'bin/javadoc').absolutePath, + '-d', outDir.absolutePath, + '-notimestamp', + '-classpath', (configurations.compileClasspath + fileTree(dir: 'lib', include: '**/*.jar')).asPath, + '-sourcepath', file('src/main/java').absolutePath, + '-link', 'https://docs.oracle.com/en/java/javase/17/docs/api/', + '-bottom', '\n\t\t\t\tLicensed under the Mozilla Public License 2.0.\n\t\t\t', + '--add-modules=java.sql.rowset', + '--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED', + 'com.mirth.connect.server.userutil', + 'com.mirth.connect.userutil', + 'com.mirth.connect.plugins.httpauth.userutil'] + def proc = new ProcessBuilder(cmd).redirectErrorStream(true).start() + def out = proc.inputStream.text + if (proc.waitFor() != 0) { + throw new GradleException("javadoc failed:\n${out}") + } + } +} + +// --------------------------------------------------------------------- +// Setup assembly (the distribution tree in setup/) +// --------------------------------------------------------------------- + +// Many sources merge into the shared setup/ tree, the way the Ant +// create-setup target assembled it. A single untracked staging task does +// those copies; the jars below keep precise tracked outputs. +def stageSetup = tasks.register('stageSetup') { + description = 'Stages libs, conf, html, extensions, docs, and module artifacts into server/setup.' + dependsOn syncDonkeyLibs, createServerExtensions, userApiJavadoc, + ':client:assemble', ':client:prepareClientLibs', ':client:writeArtifactInventory', + ':command:cliJar', ':command:cliLauncherJar', ':command:prepareCliLibs', + ':command:writeArtifactInventory' + outputs.upToDateWhen { false } + doLast { + ['conf', 'extensions', 'public_html', 'public_api_html', 'server-lib', 'client-lib', + 'cli-lib', 'logs', 'docs', 'server-launcher-lib'].each { file("setup/${it}").mkdirs() } + + // sync (not copy) so files that disappear from the sources also + // disappear from setup/ on incremental builds; the Ant build got the + // same effect by always cleaning first. preserve{} protects the jars + // that other tasks produce directly into these directories. + def serverPlacements = rootProject.stagedArtifacts(configurations.runtimeClasspath, 'server') + sync { s -> + s.from('lib') { + exclude 'ant/**' + exclude 'extensions/**' + } + s.from(files({ serverPlacements().keySet() })) { + eachFile { it.path = serverPlacements()[it.file] } + includeEmptyDirs = false + } + s.into 'setup/server-lib' + s.preserve { p -> + p.include 'mirth-crypto.jar' + p.include 'mirth-client-core.jar' + p.include 'mirth-server.jar' + p.include 'mirth-dbconf.jar' + } + } + sync { s -> + s.into 'setup/conf' + s.from 'conf' + s.from(rootProject.file('command/conf')) { + include 'mirth-cli-config.properties' + include 'log4j2-cli.properties' + } + } + sync { s -> + s.from('public_html') { exclude 'Thumbs.db' } + s.into 'setup/public_html' + } + ant.replace(dir: 'setup/public_html', includes: '*.html', + token: '@mirthversion', value: projectVersion) + sync { s -> + s.from('public_api_html') { exclude 'Thumbs.db' } + s.into 'setup/public_api_html' + } + sync { s -> + // build/extensions may still hold client jars from a previous + // build's final copy-back; the fresh client output wins. + s.duplicatesStrategy = DuplicatesStrategy.INCLUDE + s.from 'build/extensions' + s.from rootProject.file('client/dist/extensions') + s.into 'setup/extensions' + } + sync { s -> + s.from 'docs' + s.into 'setup/docs' + } + // setup root holds files from several producers; plain copies here. + copy { + into 'setup' + from('basedir-includes') { + exclude 'oieserver' + exclude 'configure-from-env' + } + from('basedir-includes') { + include 'oieserver' + include 'configure-from-env' + filePermissions { unix('0755') } + } + } + + // mirth-build.xml build-client / build-cli: client and CLI artifacts + def clientPlacements = rootProject.stagedFromInventory( + rootProject.file('client/build/placement/artifacts.json'), 'client') + sync { s -> + s.into 'setup/client-lib' + s.from rootProject.file('client/dist/mirth-client.jar') + s.from(rootProject.file('client/lib')) { + exclude '*-shared.jar' + exclude 'extensions' + } + s.from(files({ clientPlacements().keySet() })) { + eachFile { it.path = clientPlacements()[it.file] } + includeEmptyDirs = false + } + s.preserve { p -> + p.include 'userutil-sources.jar' + } + } + def cliPlacements = rootProject.stagedFromInventory( + rootProject.file('command/build/placement/artifacts.json'), 'command') + sync { s -> + s.into 'setup/cli-lib' + s.from rootProject.file('command/build/mirth-cli.jar') + s.from(rootProject.file('command/lib')) { + exclude 'mirth-client.jar' + } + s.from(files({ cliPlacements().keySet() })) { + eachFile { it.path = cliPlacements()[it.file] } + includeEmptyDirs = false + } + } + copy { + from rootProject.file('command/build/mirth-cli-launcher.jar') + into 'setup' + } + } +} + +def serverJar = tasks.register('serverJar', Jar) { + archiveFileName = 'mirth-server.jar' + destinationDirectory = file('setup/server-lib') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/server/**' + include 'com/mirth/connect/model/**' + include 'com/mirth/connect/util/**' + include 'com/mirth/connect/plugins/*.class' + include 'com/mirth/connect/connectors/*.class' + include 'org/**' + include 'net/sourceforge/jtds/ssl/**' + exclude 'com/mirth/connect/server/launcher/**' + exclude 'org/dcm4che2/**' + } + from 'mirth-client.jnlp' + from('src/main/resources/com/mirth/connect/util') { + include '*.js' + include '*.txt' + into 'com/mirth/connect/util' + } +} + +def dbconfJar = tasks.register('dbconfJar', Jar) { + archiveFileName = 'mirth-dbconf.jar' + destinationDirectory = file('setup/server-lib') + from 'dbconf' +} + +def launcherJar = tasks.register('launcherJar', Jar) { + archiveFileName = 'mirth-server-launcher.jar' + destinationDirectory = file('setup') + from(sourceSets.main.output.classesDirs) { + include 'com/mirth/connect/server/launcher/**' + include 'com/mirth/connect/server/extprops/**' + } + manifest { + attributes('Main-Class': 'com.mirth.connect.server.launcher.MirthLauncher') + } + // The Class-Path entries are generated from the resolved dependency + // versions so a catalog bump cannot leave the manifest stale (the + // Ant build hardcoded these and required a manual edit per bump). + def launcherDeps = ['commons-io', 'commons-configuration2', 'commons-lang3', + 'commons-logging', 'commons-beanutils', 'commons-text', + 'commons-collections'] + doFirst { + def byModule = [:] + configurations.runtimeClasspath.incoming.artifacts.each { a -> + def id = a.id.componentIdentifier + if (id instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier) { + byModule[id.module] = a.file.name + } + } + manifest.attributes['Class-Path'] = launcherDeps.collect { m -> + def jar = byModule[m] + if (jar == null) { + throw new GradleException("launcher Class-Path dependency '${m}' not resolved") + } + "server-lib/commons/${jar}" + }.join(' ') + ' conf/' + } +} + +def userutilSourcesJar = tasks.register('userutilSourcesJar', Jar) { + archiveFileName = 'userutil-sources.jar' + destinationDirectory = file('setup/client-lib') + from('src/main/java') { + include 'com/mirth/connect/userutil/**.java' + include 'com/mirth/connect/server/userutil/**.java' + exclude '**/package-info.java' + } +} + +def setupContent = [stageSetup, serverJar, dbconfJar, launcherJar, + userutilSourcesJar, cryptoJar, clientCoreJar] + +// --------------------------------------------------------------------- +// Jar signing (Java Web Start). Same signing inputs and manifest +// mutation as the Ant create-setup target; differences: sequential +// rather than 4-thread signing, the -certchain argument for the CA +// path, and a fail-fast retry that protects hardware tokens. +// --------------------------------------------------------------------- + +def signSetupJars = tasks.register('signSetupJars') { + description = 'Adds JWS manifest attributes and signs the client-lib and extension jars.' + dependsOn setupContent + onlyIf { !rootProject.disableSigning } + outputs.upToDateWhen { false } + doLast { + def manifestJars = fileTree('setup/client-lib') { + include '**/*.jar' + exclude 'bcp*.jar' + exclude 'bcutil*.jar' + } + fileTree('setup/extensions') { include '**/*.jar' } + + logger.lifecycle 'Modifying jar manifests to add JWS permission attributes' + def manifestPath = file('custom_manifest.mf').absolutePath + manifestJars.each { jarFile -> + // ProcessBuilder rather than exec(Closure): the latter is + // removed in Gradle 9 + def proc = new ProcessBuilder('jar', 'umf', manifestPath, jarFile.absolutePath) + .redirectErrorStream(true).start() + def out = proc.inputStream.text + if (proc.waitFor() != 0) { + throw new GradleException("jar umf failed for ${jarFile.name}: ${out}") + } + } + + def keystoreFile = providers.gradleProperty('keystore_property_file').getOrNull() + ?: 'keystore.properties' + def keystoreProps = new Properties() + file(keystoreFile).withInputStream { keystoreProps.load(it) } + // Property precedence: a -P project property on the command line wins + // over (or supplies a missing) value from the properties file. The + // YubiKey workflow relies on this for the PIN (-Pkey.storepass=...). + def signingProp = { String name -> + providers.gradleProperty(name).getOrNull() ?: keystoreProps.getProperty(name) + } + def tsa = signingProp('signingTsa') ?: 'http://timestamp.digicert.com' + + if (!signingProp('key.storepass')) { + throw new GradleException("key.storepass is not set; add it to ${keystoreFile} " + + 'or pass it on the command line as -Pkey.storepass=...') + } + + def signJars = fileTree('setup/client-lib') { include '**/*.jar' } + + fileTree('setup/extensions') { include '**/*.jar' } + + // Retries exist for transient TSA failures (Ant used retrycount=5, + // i.e. up to 6 attempts). A failure on the very first jar means a bad + // PIN/passphrase/config, and retrying a wrong PIN against a hardware + // token can permanently block it, so fail fast until one jar has + // signed successfully. + boolean configProven = false + def withRetry = { Closure work -> + int attempts = 0 + while (true) { + try { + work() + configProven = true + return + } catch (Exception e) { + attempts++ + if (!configProven || attempts > 5) { + throw e + } + logger.warn "signjar failed (attempt ${attempts}), retrying: ${e.message}" + Thread.sleep(1000) + } + } + } + + if (signingProp('cert') == 'ca') { + logger.lifecycle 'Signing with CA certificate' + signJars.each { jarFile -> + withRetry { + ant.signjar(jar: jarFile.absolutePath, + alias: signingProp('key.alias'), + storepass: signingProp('key.storepass'), + storetype: signingProp('key.storetype'), + providerclass: signingProp('key.providerclass'), + providerarg: signingProp('key.providerarg'), + tsaurl: tsa) { + arg(value: '-certchain') + arg(value: signingProp('key.certchain')) + sysproperty(key: 'jsse.enableSNIExtension', value: 'false') + sysproperty(key: 'https.protocols', value: 'TLSv1.2,TLSv1.1') + } + } + } + } else { + logger.lifecycle 'Signing with self-signed certificate' + signJars.each { jarFile -> + withRetry { + ant.signjar(jar: jarFile.absolutePath, + alias: signingProp('key.alias'), + keystore: signingProp('key.keystore'), + storepass: signingProp('key.storepass'), + keypass: signingProp('key.keypass'), + storetype: signingProp('key.storetype'), + tsaurl: tsa, + digestalg: 'SHA-256') { + sysproperty(key: 'jsse.enableSNIExtension', value: 'false') + sysproperty(key: 'https.protocols', value: 'TLSv1.2,TLSv1.1') + } + } + } + } + } +} + +def createSetup = tasks.register('createSetup') { + group = 'build' + description = 'Assembles the full distribution tree in server/setup.' + dependsOn setupContent, signSetupJars, ':verifyVendoredParity' +} + +assemble.dependsOn createSetup + +// --------------------------------------------------------------------- +// Distribution extension zips (create-extension-zips) +// --------------------------------------------------------------------- + +// Exactly the zip list from server/build.xml (mllpmode, scriptfilerule, +// and xsltstep have no zips there either). +def zippedExtensions = ['jms', 'jdbc', 'dicom', 'http', 'doc', 'smtp', 'tcp', 'file', 'js', + 'ws', 'vm', 'datatype-delimited', 'datatype-dicom', 'datatype-edi', + 'datatype-hl7v2', 'datatype-hl7v3', 'datatype-ncpdp', 'datatype-xml', + 'datatype-raw', 'datatype-json', 'directoryresource', 'dashboardstatus', + 'destinationsetfilter', 'serverlog', 'datapruner', 'javascriptstep', + 'mapper', 'messagebuilder', 'scriptfilestep', 'rulebuilder', + 'javascriptrule', 'dicomviewer', 'pdfviewer', 'textviewer', 'httpauth', + 'imageviewer', 'globalmapviewer'] + +// The zip names carry the version, so clear the directory first the way +// Ant did; otherwise zips from previous versions accumulate. +def cleanExtensionZips = tasks.register('cleanExtensionZips', Delete) { + delete 'dist/extensions' +} + +def extensionZipTasks = zippedExtensions.collect { name -> + tasks.register("zip_${name.replace('-', '_')}", Zip) { + archiveFileName = "${name}-${version}.zip" + destinationDirectory = file('dist/extensions') + // Zip the final (possibly signed) extension content. + from('setup/extensions') { include "${name}/**" } + dependsOn createSetup, cleanExtensionZips + } +} + +tasks.register('createExtensionZips') { + group = 'build' + description = 'Creates the per-extension distribution zips in server/dist/extensions.' + dependsOn extensionZipTasks +} + +// --------------------------------------------------------------------- +// Tests +// --------------------------------------------------------------------- + +def testsJar = tasks.register('testsJar', Jar) { + archiveFileName = 'mirth-server-tests.jar' + destinationDirectory = file('testdist') + from sourceSets.test.output +} + +test { + dependsOn testsJar + jvmArgs '--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/java.lang=ALL-UNNAMED', + '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED', + '--add-opens=java.base/java.text=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED', + '--add-opens=java.desktop/java.awt=ALL-UNNAMED', + '--add-opens=java.desktop/java.awt.font=ALL-UNNAMED', + '--add-opens=java.sql/java.sql=ALL-UNNAMED', + '--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED', + '--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED', + '--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED', + '--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED', + '--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED' +} + +// --------------------------------------------------------------------- +// Development helpers (dev-run, dev-launcher, create-derby-db) +// --------------------------------------------------------------------- + +tasks.register('createDerbyDb', JavaExec) { + description = 'Recreates the embedded Derby database (mirrors create-derby-db).' + mainClass = 'com.mirth.connect.server.tools.ScriptRunner' + workingDir = projectDir + // staged server-lib reproduces the historical lib layout + classpath = files('setup/server-lib/mirth-server.jar', sourceSets.main.output, 'setup/conf') + + fileTree('setup/server-lib') { + include 'log4j/log4j-api-*.jar' + include 'log4j/log4j-core-*.jar' + include 'database/derby-1*.jar' + include 'database/derbytools-*.jar' + include 'commons/commons-io-*.jar' + } + args 'dbconf/derby/derby-database.sql' + dependsOn serverJar, stageSetup + doFirst { delete 'mirthdb' } +} + +// JDK module flags for running the server come from the same file the +// production launcher uses, one source of truth. +def serverModuleFlags = { + file('conf/default_modules.vmoptions').readLines() + .collect { it.trim() } + .findAll { it.startsWith('-') } +} + +tasks.register('devLauncher', JavaExec) { + description = 'Runs OIE using the setup launcher (mirrors dev-launcher).' + mainClass = 'com.mirth.connect.server.launcher.MirthLauncher' + workingDir = file('setup') + classpath = files('setup/mirth-server-launcher.jar') + dependsOn 'createSetup' + doFirst { jvmArgs serverModuleFlags() } +} + +tasks.register('devRun', JavaExec) { + description = 'Runs the OIE server from the development tree (mirrors dev-run).' + mainClass = 'com.mirth.connect.server.Mirth' + workingDir = projectDir + classpath = files('conf') + sourceSets.main.runtimeClasspath + doFirst { jvmArgs serverModuleFlags() } +} + +clean { + delete 'classes', 'test_classes', 'setup', 'dist', 'testdist', 'docs/javadocs', 'logs' + doLast { file('logs').mkdirs() } +} diff --git a/server/build.properties b/server/build.properties deleted file mode 100644 index 17b624559c..0000000000 --- a/server/build.properties +++ /dev/null @@ -1,71 +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.dir=${basedir}/build -extensions=${build.dir}/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 - -# Reports -reports.dir=${build.dir}/reports - -# JUnit Raw Results (XML) -test.results.dir=${build.dir}/test-results/test - -# JUnit Human-Readable Reports (HTML) -reports.tests.dir=${reports.dir}/tests/test - -# JaCoCo Execution Data (.exec) -jacoco.data.dir=${build.dir}/jacoco -jacoco.exec.file=${jacoco.data.dir}/test.exec - -# JaCoCo Reports (HTML and XML) -reports.jacoco.dir=${reports.dir}/jacoco/test -reports.jacoco.html=${reports.jacoco.dir}/html -reports.jacoco.xml=${reports.jacoco.dir}/jacocoTestReport.xml - -# 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.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 - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/server/build.xml b/server/build.xml index b450642bbb..4d3cb0fe70 100644 --- a/server/build.xml +++ b/server/build.xml @@ -1,1411 +1,14 @@ - - - - - - - - - - OIE Build Help - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sub-project files have been copied into setup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mozilla Public License 2.0.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests WITH JaCoCo coverage. - - - - - - - - - - - - - - - - - - - - - - - - - - - Run unit tests. Coverage is only enabled if 'jacoco.agent.arg' is set. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +The Ant build has been replaced by Gradle. + + ./gradlew build (run from the repository root) + gradlew.bat build (on Windows) + +See CONTRIBUTING.md for build, test, and release commands. + + + diff --git a/server/lib/HikariCP-2.5.1.jar b/server/lib/HikariCP-2.5.1.jar deleted file mode 100644 index bcd609f76d..0000000000 Binary files a/server/lib/HikariCP-2.5.1.jar and /dev/null differ diff --git a/server/lib/ant/ant-contrib-1.0b3.jar b/server/lib/ant/ant-contrib-1.0b3.jar deleted file mode 100644 index 062537661a..0000000000 Binary files a/server/lib/ant/ant-contrib-1.0b3.jar and /dev/null differ diff --git a/server/lib/ant/asm-9.2.jar b/server/lib/ant/asm-9.2.jar deleted file mode 100644 index 3557ae4140..0000000000 Binary files a/server/lib/ant/asm-9.2.jar and /dev/null differ diff --git a/server/lib/ant/asm-commons-9.2.jar b/server/lib/ant/asm-commons-9.2.jar deleted file mode 100644 index 01028a0035..0000000000 Binary files a/server/lib/ant/asm-commons-9.2.jar and /dev/null differ diff --git a/server/lib/ant/asm-tree-9.2.jar b/server/lib/ant/asm-tree-9.2.jar deleted file mode 100644 index 0a6833a688..0000000000 Binary files a/server/lib/ant/asm-tree-9.2.jar and /dev/null differ diff --git a/server/lib/ant/org.jacoco.agent-0.8.8.jar b/server/lib/ant/org.jacoco.agent-0.8.8.jar deleted file mode 100644 index f21efca71b..0000000000 Binary files a/server/lib/ant/org.jacoco.agent-0.8.8.jar and /dev/null differ diff --git a/server/lib/ant/org.jacoco.ant-0.8.8.jar b/server/lib/ant/org.jacoco.ant-0.8.8.jar deleted file mode 100644 index 3769c01c28..0000000000 Binary files a/server/lib/ant/org.jacoco.ant-0.8.8.jar and /dev/null differ diff --git a/server/lib/ant/org.jacoco.core-0.8.8.jar b/server/lib/ant/org.jacoco.core-0.8.8.jar deleted file mode 100644 index bbccce107f..0000000000 Binary files a/server/lib/ant/org.jacoco.core-0.8.8.jar and /dev/null differ diff --git a/server/lib/ant/org.jacoco.report-0.8.8.jar b/server/lib/ant/org.jacoco.report-0.8.8.jar deleted file mode 100644 index ccb60c8ebc..0000000000 Binary files a/server/lib/ant/org.jacoco.report-0.8.8.jar and /dev/null differ diff --git a/server/lib/aws/annotations-2.15.28.jar b/server/lib/aws/annotations-2.15.28.jar deleted file mode 100644 index 767edfff5d..0000000000 Binary files a/server/lib/aws/annotations-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/apache-client-2.15.28.jar b/server/lib/aws/apache-client-2.15.28.jar deleted file mode 100644 index 5f17bde371..0000000000 Binary files a/server/lib/aws/apache-client-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/auth-2.15.28.jar b/server/lib/aws/auth-2.15.28.jar deleted file mode 100644 index 530bc24d6e..0000000000 Binary files a/server/lib/aws/auth-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/aws-core-2.15.28.jar b/server/lib/aws/aws-core-2.15.28.jar deleted file mode 100644 index 14f377ebfe..0000000000 Binary files a/server/lib/aws/aws-core-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/aws-json-protocol-2.15.28.jar b/server/lib/aws/aws-json-protocol-2.15.28.jar deleted file mode 100644 index 7ca0d3f6ca..0000000000 Binary files a/server/lib/aws/aws-json-protocol-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/aws-query-protocol-2.15.28.jar b/server/lib/aws/aws-query-protocol-2.15.28.jar deleted file mode 100644 index 0d40dd69cf..0000000000 Binary files a/server/lib/aws/aws-query-protocol-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/aws-xml-protocol-2.15.28.jar b/server/lib/aws/aws-xml-protocol-2.15.28.jar deleted file mode 100644 index 6fecab52b3..0000000000 Binary files a/server/lib/aws/aws-xml-protocol-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/eventstream-1.0.1.jar b/server/lib/aws/eventstream-1.0.1.jar deleted file mode 100644 index 6397d9395d..0000000000 Binary files a/server/lib/aws/eventstream-1.0.1.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar deleted file mode 100644 index 2453c4c290..0000000000 Binary files a/server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar deleted file mode 100644 index fc85ca90f5..0000000000 Binary files a/server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar deleted file mode 100644 index 0275c9c211..0000000000 Binary files a/server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar deleted file mode 100644 index 0f9a0d6b88..0000000000 Binary files a/server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar deleted file mode 100644 index c3fffb3940..0000000000 Binary files a/server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar deleted file mode 100644 index fc2700f36d..0000000000 Binary files a/server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-nio-client-2.20.140.jar b/server/lib/aws/ext/netty/netty-nio-client-2.20.140.jar deleted file mode 100644 index 0905556bf9..0000000000 Binary files a/server/lib/aws/ext/netty/netty-nio-client-2.20.140.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-reactive-streams-2.0.8.jar b/server/lib/aws/ext/netty/netty-reactive-streams-2.0.8.jar deleted file mode 100644 index 598dbadbe7..0000000000 Binary files a/server/lib/aws/ext/netty/netty-reactive-streams-2.0.8.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-reactive-streams-http-2.0.8.jar b/server/lib/aws/ext/netty/netty-reactive-streams-http-2.0.8.jar deleted file mode 100644 index 9ddf370d37..0000000000 Binary files a/server/lib/aws/ext/netty/netty-reactive-streams-http-2.0.8.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar deleted file mode 100644 index ebaee0e2b9..0000000000 Binary files a/server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar deleted file mode 100644 index 49779c9502..0000000000 Binary files a/server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar b/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar deleted file mode 100644 index 11ee9f24f7..0000000000 Binary files a/server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar and /dev/null differ diff --git a/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar b/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar deleted file mode 100644 index 844f5047bd..0000000000 Binary files a/server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar and /dev/null differ diff --git a/server/lib/aws/ext/reactive-streams-1.0.3.jar b/server/lib/aws/ext/reactive-streams-1.0.3.jar deleted file mode 100644 index b9b487caa3..0000000000 Binary files a/server/lib/aws/ext/reactive-streams-1.0.3.jar and /dev/null differ diff --git a/server/lib/aws/http-client-spi-2.15.28.jar b/server/lib/aws/http-client-spi-2.15.28.jar deleted file mode 100644 index cc96bdab2c..0000000000 Binary files a/server/lib/aws/http-client-spi-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/kms-2.15.28.jar b/server/lib/aws/kms-2.15.28.jar deleted file mode 100644 index 1ab7ca4d47..0000000000 Binary files a/server/lib/aws/kms-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/metrics-spi-2.15.28.jar b/server/lib/aws/metrics-spi-2.15.28.jar deleted file mode 100644 index 715c09a06e..0000000000 Binary files a/server/lib/aws/metrics-spi-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/profiles-2.15.28.jar b/server/lib/aws/profiles-2.15.28.jar deleted file mode 100644 index 6735e6ef93..0000000000 Binary files a/server/lib/aws/profiles-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/protocol-core-2.15.28.jar b/server/lib/aws/protocol-core-2.15.28.jar deleted file mode 100644 index 950f52c6ec..0000000000 Binary files a/server/lib/aws/protocol-core-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/regions-2.15.28.jar b/server/lib/aws/regions-2.15.28.jar deleted file mode 100644 index 3ed0d0f66b..0000000000 Binary files a/server/lib/aws/regions-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/s3-2.15.28.jar b/server/lib/aws/s3-2.15.28.jar deleted file mode 100644 index 7d0d711d82..0000000000 Binary files a/server/lib/aws/s3-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/sdk-core-2.15.28.jar b/server/lib/aws/sdk-core-2.15.28.jar deleted file mode 100644 index 903e1e1a65..0000000000 Binary files a/server/lib/aws/sdk-core-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/sts-2.15.28.jar b/server/lib/aws/sts-2.15.28.jar deleted file mode 100644 index 5bc1ffc608..0000000000 Binary files a/server/lib/aws/sts-2.15.28.jar and /dev/null differ diff --git a/server/lib/aws/utils-2.15.28.jar b/server/lib/aws/utils-2.15.28.jar deleted file mode 100644 index 6e97c99671..0000000000 Binary files a/server/lib/aws/utils-2.15.28.jar and /dev/null differ diff --git a/server/lib/bcpkix-jdk18on-1.78.1.jar b/server/lib/bcpkix-jdk18on-1.78.1.jar deleted file mode 100644 index dca7170eeb..0000000000 Binary files a/server/lib/bcpkix-jdk18on-1.78.1.jar and /dev/null differ diff --git a/server/lib/bcprov-jdk18on-1.78.1.jar b/server/lib/bcprov-jdk18on-1.78.1.jar deleted file mode 100644 index 6726f83391..0000000000 Binary files a/server/lib/bcprov-jdk18on-1.78.1.jar and /dev/null differ diff --git a/server/lib/bcutil-jdk18on-1.78.1.jar b/server/lib/bcutil-jdk18on-1.78.1.jar deleted file mode 100644 index 348a2fff6d..0000000000 Binary files a/server/lib/bcutil-jdk18on-1.78.1.jar and /dev/null differ diff --git a/server/lib/classgraph-4.8.179.jar b/server/lib/classgraph-4.8.179.jar deleted file mode 100644 index b8d3c14c3b..0000000000 Binary files a/server/lib/classgraph-4.8.179.jar and /dev/null differ diff --git a/server/lib/commons/commons-beanutils-1.11.0.jar b/server/lib/commons/commons-beanutils-1.11.0.jar deleted file mode 100644 index 6b7b993661..0000000000 Binary files a/server/lib/commons/commons-beanutils-1.11.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-cli-1.2.jar b/server/lib/commons/commons-cli-1.2.jar deleted file mode 100644 index ce4b9fffe4..0000000000 Binary files a/server/lib/commons/commons-cli-1.2.jar and /dev/null differ diff --git a/server/lib/commons/commons-codec-1.21.0.jar b/server/lib/commons/commons-codec-1.21.0.jar deleted file mode 100644 index 99989eb59b..0000000000 Binary files a/server/lib/commons/commons-codec-1.21.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-collections-3.2.2.jar b/server/lib/commons/commons-collections-3.2.2.jar deleted file mode 100644 index fa5df82a63..0000000000 Binary files a/server/lib/commons/commons-collections-3.2.2.jar and /dev/null differ diff --git a/server/lib/commons/commons-collections4-4.4.jar b/server/lib/commons/commons-collections4-4.4.jar deleted file mode 100644 index da06c3e4ba..0000000000 Binary files a/server/lib/commons/commons-collections4-4.4.jar and /dev/null differ diff --git a/server/lib/commons/commons-compress-1.28.0.jar b/server/lib/commons/commons-compress-1.28.0.jar deleted file mode 100644 index ff7e6aad05..0000000000 Binary files a/server/lib/commons/commons-compress-1.28.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-configuration2-2.13.0.jar b/server/lib/commons/commons-configuration2-2.13.0.jar deleted file mode 100644 index 1809bc354d..0000000000 Binary files a/server/lib/commons/commons-configuration2-2.13.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-dbcp2-2.0.1.jar b/server/lib/commons/commons-dbcp2-2.0.1.jar deleted file mode 100644 index 5e8d142dd7..0000000000 Binary files a/server/lib/commons/commons-dbcp2-2.0.1.jar and /dev/null differ diff --git a/server/lib/commons/commons-dbutils-1.7.jar b/server/lib/commons/commons-dbutils-1.7.jar deleted file mode 100644 index b30458ee54..0000000000 Binary files a/server/lib/commons/commons-dbutils-1.7.jar and /dev/null differ diff --git a/server/lib/commons/commons-digester3-3.2.jar b/server/lib/commons/commons-digester3-3.2.jar deleted file mode 100644 index 62e5140a58..0000000000 Binary files a/server/lib/commons/commons-digester3-3.2.jar and /dev/null differ diff --git a/server/lib/commons/commons-el-1.0.jar b/server/lib/commons/commons-el-1.0.jar deleted file mode 100644 index 608ed796ca..0000000000 Binary files a/server/lib/commons/commons-el-1.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-email-1.6.0.jar b/server/lib/commons/commons-email-1.6.0.jar deleted file mode 100644 index c520d58430..0000000000 Binary files a/server/lib/commons/commons-email-1.6.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-fileupload-1.6.0.jar b/server/lib/commons/commons-fileupload-1.6.0.jar deleted file mode 100644 index 63af9e1294..0000000000 Binary files a/server/lib/commons/commons-fileupload-1.6.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-httpclient-3.0.1.jar b/server/lib/commons/commons-httpclient-3.0.1.jar deleted file mode 100644 index cfc777c71d..0000000000 Binary files a/server/lib/commons/commons-httpclient-3.0.1.jar and /dev/null differ diff --git a/server/lib/commons/commons-io-2.21.0.jar b/server/lib/commons/commons-io-2.21.0.jar deleted file mode 100644 index 7f1688194e..0000000000 Binary files a/server/lib/commons/commons-io-2.21.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-jxpath-1.3.jar b/server/lib/commons/commons-jxpath-1.3.jar deleted file mode 100644 index e344a1e66d..0000000000 Binary files a/server/lib/commons/commons-jxpath-1.3.jar and /dev/null differ diff --git a/server/lib/commons/commons-lang3-3.20.0.jar b/server/lib/commons/commons-lang3-3.20.0.jar deleted file mode 100644 index 8682b86d3f..0000000000 Binary files a/server/lib/commons/commons-lang3-3.20.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-logging-1.3.5.jar b/server/lib/commons/commons-logging-1.3.5.jar deleted file mode 100644 index 75d93a15cf..0000000000 Binary files a/server/lib/commons/commons-logging-1.3.5.jar and /dev/null differ diff --git a/server/lib/commons/commons-math3-3.0.jar b/server/lib/commons/commons-math3-3.0.jar deleted file mode 100644 index ff84bd293c..0000000000 Binary files a/server/lib/commons/commons-math3-3.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-net-3.9.0.jar b/server/lib/commons/commons-net-3.9.0.jar deleted file mode 100644 index e64cd8aa86..0000000000 Binary files a/server/lib/commons/commons-net-3.9.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-pool2-2.3.jar b/server/lib/commons/commons-pool2-2.3.jar deleted file mode 100644 index 5219e1cc23..0000000000 Binary files a/server/lib/commons/commons-pool2-2.3.jar and /dev/null differ diff --git a/server/lib/commons/commons-text-1.15.0.jar b/server/lib/commons/commons-text-1.15.0.jar deleted file mode 100644 index 1ac427909f..0000000000 Binary files a/server/lib/commons/commons-text-1.15.0.jar and /dev/null differ diff --git a/server/lib/commons/commons-vfs2-2.10.0.jar b/server/lib/commons/commons-vfs2-2.10.0.jar deleted file mode 100644 index cf5182ed13..0000000000 Binary files a/server/lib/commons/commons-vfs2-2.10.0.jar and /dev/null differ diff --git a/server/lib/commons/httpclient-4.5.13.jar b/server/lib/commons/httpclient-4.5.13.jar deleted file mode 100644 index 218ee25f2b..0000000000 Binary files a/server/lib/commons/httpclient-4.5.13.jar and /dev/null differ diff --git a/server/lib/commons/httpcore-4.4.13.jar b/server/lib/commons/httpcore-4.4.13.jar deleted file mode 100644 index 163dc438cb..0000000000 Binary files a/server/lib/commons/httpcore-4.4.13.jar and /dev/null differ diff --git a/server/lib/commons/httpmime-4.5.13.jar b/server/lib/commons/httpmime-4.5.13.jar deleted file mode 100644 index cc52f44a3a..0000000000 Binary files a/server/lib/commons/httpmime-4.5.13.jar and /dev/null differ diff --git a/server/lib/database/derby-10.10.2.0.jar b/server/lib/database/derby-10.10.2.0.jar deleted file mode 100644 index a4d56f0d41..0000000000 Binary files a/server/lib/database/derby-10.10.2.0.jar and /dev/null differ diff --git a/server/lib/database/derbytools-10.10.2.0.jar b/server/lib/database/derbytools-10.10.2.0.jar deleted file mode 100644 index 216ff3eeed..0000000000 Binary files a/server/lib/database/derbytools-10.10.2.0.jar and /dev/null differ diff --git a/server/lib/database/mssql-jdbc-8.4.1.jre8.jar b/server/lib/database/mssql-jdbc-8.4.1.jre8.jar deleted file mode 100644 index ad0b4b5b74..0000000000 Binary files a/server/lib/database/mssql-jdbc-8.4.1.jre8.jar and /dev/null differ diff --git a/server/lib/database/mysql-connector-j-8.4.0.jar b/server/lib/database/mysql-connector-j-8.4.0.jar deleted file mode 100644 index 8294fe0b40..0000000000 Binary files a/server/lib/database/mysql-connector-j-8.4.0.jar and /dev/null differ diff --git a/server/lib/database/ojdbc8-12.2.0.1.jar b/server/lib/database/ojdbc8-12.2.0.1.jar deleted file mode 100644 index bf412434bd..0000000000 Binary files a/server/lib/database/ojdbc8-12.2.0.1.jar and /dev/null differ diff --git a/server/lib/database/postgresql-42.7.8.jar b/server/lib/database/postgresql-42.7.8.jar deleted file mode 100644 index a9500ac258..0000000000 Binary files a/server/lib/database/postgresql-42.7.8.jar and /dev/null differ diff --git a/server/lib/extensions/dicomviewer/ij.jar b/server/lib/extensions/dicomviewer/ij.jar deleted file mode 100644 index 250e3b02ef..0000000000 Binary files a/server/lib/extensions/dicomviewer/ij.jar and /dev/null differ diff --git a/server/lib/extensions/doc/flying-saucer-core-9.0.1.jar b/server/lib/extensions/doc/flying-saucer-core-9.0.1.jar deleted file mode 100644 index de4c265e98..0000000000 Binary files a/server/lib/extensions/doc/flying-saucer-core-9.0.1.jar and /dev/null differ diff --git a/server/lib/extensions/doc/flying-saucer-pdf-9.0.1.jar b/server/lib/extensions/doc/flying-saucer-pdf-9.0.1.jar deleted file mode 100644 index fa15d412bf..0000000000 Binary files a/server/lib/extensions/doc/flying-saucer-pdf-9.0.1.jar and /dev/null differ diff --git a/server/lib/extensions/doc/fontbox-2.0.24.jar b/server/lib/extensions/doc/fontbox-2.0.24.jar deleted file mode 100644 index e93794c15a..0000000000 Binary files a/server/lib/extensions/doc/fontbox-2.0.24.jar and /dev/null differ diff --git a/server/lib/extensions/doc/graphics2d-0.32.jar b/server/lib/extensions/doc/graphics2d-0.32.jar deleted file mode 100644 index b02ea333df..0000000000 Binary files a/server/lib/extensions/doc/graphics2d-0.32.jar and /dev/null differ diff --git a/server/lib/extensions/doc/itext-2.1.7.jar b/server/lib/extensions/doc/itext-2.1.7.jar deleted file mode 100644 index 3f2c188223..0000000000 Binary files a/server/lib/extensions/doc/itext-2.1.7.jar and /dev/null differ diff --git a/server/lib/extensions/doc/itext-rtf-2.1.7.jar b/server/lib/extensions/doc/itext-rtf-2.1.7.jar deleted file mode 100644 index ba008955d9..0000000000 Binary files a/server/lib/extensions/doc/itext-rtf-2.1.7.jar and /dev/null differ diff --git a/server/lib/extensions/doc/openhtmltopdf-core-1.0.9.jar b/server/lib/extensions/doc/openhtmltopdf-core-1.0.9.jar deleted file mode 100644 index 46896d8191..0000000000 Binary files a/server/lib/extensions/doc/openhtmltopdf-core-1.0.9.jar and /dev/null differ diff --git a/server/lib/extensions/doc/openhtmltopdf-pdfbox-1.0.9.jar b/server/lib/extensions/doc/openhtmltopdf-pdfbox-1.0.9.jar deleted file mode 100644 index c8e0a53b70..0000000000 Binary files a/server/lib/extensions/doc/openhtmltopdf-pdfbox-1.0.9.jar and /dev/null differ diff --git a/server/lib/extensions/doc/pdfbox-2.0.24.jar b/server/lib/extensions/doc/pdfbox-2.0.24.jar deleted file mode 100644 index c6515b84d6..0000000000 Binary files a/server/lib/extensions/doc/pdfbox-2.0.24.jar and /dev/null differ diff --git a/server/lib/extensions/doc/xmpbox-2.0.24.jar b/server/lib/extensions/doc/xmpbox-2.0.24.jar deleted file mode 100644 index c31e347b65..0000000000 Binary files a/server/lib/extensions/doc/xmpbox-2.0.24.jar and /dev/null differ diff --git a/server/lib/extensions/file/jcifs-ng-2.1.10.jar b/server/lib/extensions/file/jcifs-ng-2.1.10.jar deleted file mode 100644 index ae9a3463df..0000000000 Binary files a/server/lib/extensions/file/jcifs-ng-2.1.10.jar and /dev/null differ diff --git a/server/lib/guice-4.1.0.jar b/server/lib/guice-4.1.0.jar deleted file mode 100644 index 92cad689de..0000000000 Binary files a/server/lib/guice-4.1.0.jar and /dev/null differ diff --git a/server/lib/hapi/hapi-structures-v27-2.3.jar b/server/lib/hapi/hapi-structures-v27-2.3.jar deleted file mode 100644 index c0c2ed5791..0000000000 Binary files a/server/lib/hapi/hapi-structures-v27-2.3.jar and /dev/null differ diff --git a/server/lib/hapi/hapi-structures-v28-2.3.jar b/server/lib/hapi/hapi-structures-v28-2.3.jar deleted file mode 100644 index 47d16f3486..0000000000 Binary files a/server/lib/hapi/hapi-structures-v28-2.3.jar and /dev/null differ diff --git a/server/lib/hapi/hapi-structures-v281-2.3.jar b/server/lib/hapi/hapi-structures-v281-2.3.jar deleted file mode 100644 index 85a21168f9..0000000000 Binary files a/server/lib/hapi/hapi-structures-v281-2.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-annotations-2.14.3.jar b/server/lib/jackson/jackson-annotations-2.14.3.jar deleted file mode 100644 index f10f7802de..0000000000 Binary files a/server/lib/jackson/jackson-annotations-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-core-2.14.3.jar b/server/lib/jackson/jackson-core-2.14.3.jar deleted file mode 100644 index b1fb3f270e..0000000000 Binary files a/server/lib/jackson/jackson-core-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-databind-2.14.3.jar b/server/lib/jackson/jackson-databind-2.14.3.jar deleted file mode 100644 index a4791e503d..0000000000 Binary files a/server/lib/jackson/jackson-databind-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-dataformat-cbor-2.14.3.jar b/server/lib/jackson/jackson-dataformat-cbor-2.14.3.jar deleted file mode 100644 index 77b32605a6..0000000000 Binary files a/server/lib/jackson/jackson-dataformat-cbor-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-dataformat-yaml-2.14.3.jar b/server/lib/jackson/jackson-dataformat-yaml-2.14.3.jar deleted file mode 100644 index 5d49c43977..0000000000 Binary files a/server/lib/jackson/jackson-dataformat-yaml-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/jackson-datatype-jsr310-2.14.3.jar b/server/lib/jackson/jackson-datatype-jsr310-2.14.3.jar deleted file mode 100644 index 38825795e2..0000000000 Binary files a/server/lib/jackson/jackson-datatype-jsr310-2.14.3.jar and /dev/null differ diff --git a/server/lib/jackson/snakeyaml-2.5.jar b/server/lib/jackson/snakeyaml-2.5.jar deleted file mode 100644 index 8186451412..0000000000 Binary files a/server/lib/jackson/snakeyaml-2.5.jar and /dev/null differ diff --git a/server/lib/java-semver-0.10.2.jar b/server/lib/java-semver-0.10.2.jar deleted file mode 100644 index 875926e9ac..0000000000 Binary files a/server/lib/java-semver-0.10.2.jar and /dev/null differ diff --git a/server/lib/javassist-3.26.0-GA.jar b/server/lib/javassist-3.26.0-GA.jar deleted file mode 100644 index cb87f4a6a3..0000000000 Binary files a/server/lib/javassist-3.26.0-GA.jar and /dev/null differ diff --git a/server/lib/javax/jakarta.activation-1.2.1.jar b/server/lib/javax/jakarta.activation-1.2.1.jar deleted file mode 100644 index fa6aad23af..0000000000 Binary files a/server/lib/javax/jakarta.activation-1.2.1.jar and /dev/null differ diff --git a/server/lib/javax/jakarta.mail-1.6.7.jar b/server/lib/javax/jakarta.mail-1.6.7.jar deleted file mode 100644 index 2fbf85113a..0000000000 Binary files a/server/lib/javax/jakarta.mail-1.6.7.jar and /dev/null differ diff --git a/server/lib/javax/javax.activation-api-1.2.0.jar b/server/lib/javax/javax.activation-api-1.2.0.jar deleted file mode 100644 index 986c365096..0000000000 Binary files a/server/lib/javax/javax.activation-api-1.2.0.jar and /dev/null differ diff --git a/server/lib/javax/javax.annotation-api-1.3.2.jar b/server/lib/javax/javax.annotation-api-1.3.2.jar deleted file mode 100644 index a8a470a71a..0000000000 Binary files a/server/lib/javax/javax.annotation-api-1.3.2.jar and /dev/null differ diff --git a/server/lib/javax/javax.inject-2.4.0-b31.jar b/server/lib/javax/javax.inject-2.4.0-b31.jar deleted file mode 100644 index 1f60d98a76..0000000000 Binary files a/server/lib/javax/javax.inject-2.4.0-b31.jar and /dev/null differ diff --git a/server/lib/javax/javax.json-1.0.4.jar b/server/lib/javax/javax.json-1.0.4.jar deleted file mode 100644 index 09967d8158..0000000000 Binary files a/server/lib/javax/javax.json-1.0.4.jar and /dev/null differ diff --git a/server/lib/javax/javax.json-api-1.0.jar b/server/lib/javax/javax.json-api-1.0.jar deleted file mode 100644 index d276c793c7..0000000000 Binary files a/server/lib/javax/javax.json-api-1.0.jar and /dev/null differ diff --git a/server/lib/javax/javax.servlet-api-3.1.0.jar b/server/lib/javax/javax.servlet-api-3.1.0.jar deleted file mode 100644 index 6b14c3d267..0000000000 Binary files a/server/lib/javax/javax.servlet-api-3.1.0.jar and /dev/null differ diff --git a/server/lib/javax/javax.ws.rs-api-2.0.1.jar b/server/lib/javax/javax.ws.rs-api-2.0.1.jar deleted file mode 100644 index 7eb68b4a0a..0000000000 Binary files a/server/lib/javax/javax.ws.rs-api-2.0.1.jar and /dev/null differ diff --git a/server/lib/javax/jaxb/ext/txw2-2.4.0-b180725.0644.jar b/server/lib/javax/jaxb/ext/txw2-2.4.0-b180725.0644.jar deleted file mode 100644 index 93e48c652f..0000000000 Binary files a/server/lib/javax/jaxb/ext/txw2-2.4.0-b180725.0644.jar and /dev/null differ diff --git a/server/lib/javax/jaxb/jaxb-api-2.4.0-b180725.0427.jar b/server/lib/javax/jaxb/jaxb-api-2.4.0-b180725.0427.jar deleted file mode 100644 index 5dea8fef42..0000000000 Binary files a/server/lib/javax/jaxb/jaxb-api-2.4.0-b180725.0427.jar and /dev/null differ diff --git a/server/lib/javax/jaxb/jaxb-runtime-2.4.0-b180725.0644.jar b/server/lib/javax/jaxb/jaxb-runtime-2.4.0-b180725.0644.jar deleted file mode 100644 index 8ddbf7d6b7..0000000000 Binary files a/server/lib/javax/jaxb/jaxb-runtime-2.4.0-b180725.0644.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/FastInfoset-1.2.13.jar b/server/lib/javax/jaxws/ext/FastInfoset-1.2.13.jar deleted file mode 100644 index 933e4eeacc..0000000000 Binary files a/server/lib/javax/jaxws/ext/FastInfoset-1.2.13.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/gmbal-api-only-3.1.0.b001.jar b/server/lib/javax/jaxws/ext/gmbal-api-only-3.1.0.b001.jar deleted file mode 100644 index b062fddaf8..0000000000 Binary files a/server/lib/javax/jaxws/ext/gmbal-api-only-3.1.0.b001.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/ha-api-3.1.9.jar b/server/lib/javax/jaxws/ext/ha-api-3.1.9.jar deleted file mode 100644 index 4df68e1129..0000000000 Binary files a/server/lib/javax/jaxws/ext/ha-api-3.1.9.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/jsr181-api-1.0.jar b/server/lib/javax/jaxws/ext/jsr181-api-1.0.jar deleted file mode 100644 index 91538a7b6b..0000000000 Binary files a/server/lib/javax/jaxws/ext/jsr181-api-1.0.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/management-api-3.2.1.b001.jar b/server/lib/javax/jaxws/ext/management-api-3.2.1.b001.jar deleted file mode 100644 index 4fa91172db..0000000000 Binary files a/server/lib/javax/jaxws/ext/management-api-3.2.1.b001.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/mimepull-1.9.7.jar b/server/lib/javax/jaxws/ext/mimepull-1.9.7.jar deleted file mode 100644 index 9fb1fd67b6..0000000000 Binary files a/server/lib/javax/jaxws/ext/mimepull-1.9.7.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/policy-2.7.2.jar b/server/lib/javax/jaxws/ext/policy-2.7.2.jar deleted file mode 100644 index 8cc6424a1b..0000000000 Binary files a/server/lib/javax/jaxws/ext/policy-2.7.2.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/saaj-impl-1.0.jar b/server/lib/javax/jaxws/ext/saaj-impl-1.0.jar deleted file mode 100644 index 5d5dd4bc90..0000000000 Binary files a/server/lib/javax/jaxws/ext/saaj-impl-1.0.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/stax-ex-1.8.jar b/server/lib/javax/jaxws/ext/stax-ex-1.8.jar deleted file mode 100644 index 5e60637d7a..0000000000 Binary files a/server/lib/javax/jaxws/ext/stax-ex-1.8.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/ext/streambuffer-1.5.4.jar b/server/lib/javax/jaxws/ext/streambuffer-1.5.4.jar deleted file mode 100644 index cf9800fa70..0000000000 Binary files a/server/lib/javax/jaxws/ext/streambuffer-1.5.4.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/javax.xml.soap-api-1.4.0.jar b/server/lib/javax/jaxws/javax.xml.soap-api-1.4.0.jar deleted file mode 100644 index c47a3b0c43..0000000000 Binary files a/server/lib/javax/jaxws/javax.xml.soap-api-1.4.0.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/jaxws-api-2.3.0.jar b/server/lib/javax/jaxws/jaxws-api-2.3.0.jar deleted file mode 100644 index 575472d71e..0000000000 Binary files a/server/lib/javax/jaxws/jaxws-api-2.3.0.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/jaxws-rt-2.3.0.2.jar b/server/lib/javax/jaxws/jaxws-rt-2.3.0.2.jar deleted file mode 100644 index ab6c5d8236..0000000000 Binary files a/server/lib/javax/jaxws/jaxws-rt-2.3.0.2.jar and /dev/null differ diff --git a/server/lib/javax/jaxws/jaxws-tools-2.3.0.2.jar b/server/lib/javax/jaxws/jaxws-tools-2.3.0.2.jar deleted file mode 100644 index f0c8f44aed..0000000000 Binary files a/server/lib/javax/jaxws/jaxws-tools-2.3.0.2.jar and /dev/null differ diff --git a/server/lib/jdom2-2.0.6.1.jar b/server/lib/jdom2-2.0.6.1.jar deleted file mode 100644 index da958396b7..0000000000 Binary files a/server/lib/jdom2-2.0.6.1.jar and /dev/null differ diff --git a/server/lib/jersey/ext/aopalliance-repackaged-2.4.0-b31.jar b/server/lib/jersey/ext/aopalliance-repackaged-2.4.0-b31.jar deleted file mode 100644 index 7f59718c81..0000000000 Binary files a/server/lib/jersey/ext/aopalliance-repackaged-2.4.0-b31.jar and /dev/null differ diff --git a/server/lib/jersey/ext/asm-9.6.jar b/server/lib/jersey/ext/asm-9.6.jar deleted file mode 100644 index cc1c2cd8e4..0000000000 Binary files a/server/lib/jersey/ext/asm-9.6.jar and /dev/null differ diff --git a/server/lib/jersey/ext/asm-analysis-9.6.jar b/server/lib/jersey/ext/asm-analysis-9.6.jar deleted file mode 100644 index f4e8691b97..0000000000 Binary files a/server/lib/jersey/ext/asm-analysis-9.6.jar and /dev/null differ diff --git a/server/lib/jersey/ext/asm-commons-9.6.jar b/server/lib/jersey/ext/asm-commons-9.6.jar deleted file mode 100644 index 75f3bad86a..0000000000 Binary files a/server/lib/jersey/ext/asm-commons-9.6.jar and /dev/null differ diff --git a/server/lib/jersey/ext/asm-tree-9.6.jar b/server/lib/jersey/ext/asm-tree-9.6.jar deleted file mode 100644 index 9fe5275876..0000000000 Binary files a/server/lib/jersey/ext/asm-tree-9.6.jar and /dev/null differ diff --git a/server/lib/jersey/ext/asm-util-9.6.jar b/server/lib/jersey/ext/asm-util-9.6.jar deleted file mode 100644 index cc109b03d0..0000000000 Binary files a/server/lib/jersey/ext/asm-util-9.6.jar and /dev/null differ diff --git a/server/lib/jersey/ext/hk2-api-2.4.0-b31.jar b/server/lib/jersey/ext/hk2-api-2.4.0-b31.jar deleted file mode 100644 index 6a70ef3c18..0000000000 Binary files a/server/lib/jersey/ext/hk2-api-2.4.0-b31.jar and /dev/null differ diff --git a/server/lib/jersey/ext/hk2-locator-2.4.0-b31.jar b/server/lib/jersey/ext/hk2-locator-2.4.0-b31.jar deleted file mode 100644 index 1f38d250d1..0000000000 Binary files a/server/lib/jersey/ext/hk2-locator-2.4.0-b31.jar and /dev/null differ diff --git a/server/lib/jersey/ext/hk2-utils-2.4.0-b31.jar b/server/lib/jersey/ext/hk2-utils-2.4.0-b31.jar deleted file mode 100644 index 211ce37b11..0000000000 Binary files a/server/lib/jersey/ext/hk2-utils-2.4.0-b31.jar and /dev/null differ diff --git a/server/lib/jersey/ext/org.osgi.core-4.2.0.jar b/server/lib/jersey/ext/org.osgi.core-4.2.0.jar deleted file mode 100644 index b986ac1728..0000000000 Binary files a/server/lib/jersey/ext/org.osgi.core-4.2.0.jar and /dev/null differ diff --git a/server/lib/jersey/ext/osgi-resource-locator-1.0.1.jar b/server/lib/jersey/ext/osgi-resource-locator-1.0.1.jar deleted file mode 100644 index bd6aa17ebb..0000000000 Binary files a/server/lib/jersey/ext/osgi-resource-locator-1.0.1.jar and /dev/null differ diff --git a/server/lib/jersey/ext/persistence-api-1.0.jar b/server/lib/jersey/ext/persistence-api-1.0.jar deleted file mode 100644 index fe5dbcd47c..0000000000 Binary files a/server/lib/jersey/ext/persistence-api-1.0.jar and /dev/null differ diff --git a/server/lib/jersey/ext/validation-api-1.1.0.Final.jar b/server/lib/jersey/ext/validation-api-1.1.0.Final.jar deleted file mode 100644 index de85403868..0000000000 Binary files a/server/lib/jersey/ext/validation-api-1.1.0.Final.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-client-2.22.1.jar b/server/lib/jersey/jersey-client-2.22.1.jar deleted file mode 100644 index 687843e168..0000000000 Binary files a/server/lib/jersey/jersey-client-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-common-2.22.1.jar b/server/lib/jersey/jersey-common-2.22.1.jar deleted file mode 100644 index 9ee53873df..0000000000 Binary files a/server/lib/jersey/jersey-common-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-container-jetty-http-2.22.1.jar b/server/lib/jersey/jersey-container-jetty-http-2.22.1.jar deleted file mode 100644 index b85279c403..0000000000 Binary files a/server/lib/jersey/jersey-container-jetty-http-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-container-jetty-servlet-2.22.1.jar b/server/lib/jersey/jersey-container-jetty-servlet-2.22.1.jar deleted file mode 100644 index 4ad0e649be..0000000000 Binary files a/server/lib/jersey/jersey-container-jetty-servlet-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-container-servlet-2.22.1.jar b/server/lib/jersey/jersey-container-servlet-2.22.1.jar deleted file mode 100644 index c8ea21646f..0000000000 Binary files a/server/lib/jersey/jersey-container-servlet-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-container-servlet-core-2.22.1.jar b/server/lib/jersey/jersey-container-servlet-core-2.22.1.jar deleted file mode 100644 index 90ba052fb3..0000000000 Binary files a/server/lib/jersey/jersey-container-servlet-core-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-guava-2.22.1.jar b/server/lib/jersey/jersey-guava-2.22.1.jar deleted file mode 100644 index 70f3a0761a..0000000000 Binary files a/server/lib/jersey/jersey-guava-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-media-jaxb-2.22.1.jar b/server/lib/jersey/jersey-media-jaxb-2.22.1.jar deleted file mode 100644 index 053ed5f8bb..0000000000 Binary files a/server/lib/jersey/jersey-media-jaxb-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-media-multipart-2.22.1.jar b/server/lib/jersey/jersey-media-multipart-2.22.1.jar deleted file mode 100644 index 6e7bc572a2..0000000000 Binary files a/server/lib/jersey/jersey-media-multipart-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-proxy-client-2.22.1.jar b/server/lib/jersey/jersey-proxy-client-2.22.1.jar deleted file mode 100644 index c64e39ca7a..0000000000 Binary files a/server/lib/jersey/jersey-proxy-client-2.22.1.jar and /dev/null differ diff --git a/server/lib/jersey/jersey-server-2.22.1.jar b/server/lib/jersey/jersey-server-2.22.1.jar deleted file mode 100644 index ae288a9c39..0000000000 Binary files a/server/lib/jersey/jersey-server-2.22.1.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar b/server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar deleted file mode 100644 index b9810d6787..0000000000 Binary files a/server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar b/server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar deleted file mode 100644 index 69b33290b9..0000000000 Binary files a/server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-http-9.4.57.v20241219.jar b/server/lib/jetty/jetty-http-9.4.57.v20241219.jar deleted file mode 100644 index 58106c5e1a..0000000000 Binary files a/server/lib/jetty/jetty-http-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-io-9.4.57.v20241219.jar b/server/lib/jetty/jetty-io-9.4.57.v20241219.jar deleted file mode 100644 index bfcd6dd13b..0000000000 Binary files a/server/lib/jetty/jetty-io-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar b/server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar deleted file mode 100644 index 8f590c64b0..0000000000 Binary files a/server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-plus-9.4.57.v20241219.jar b/server/lib/jetty/jetty-plus-9.4.57.v20241219.jar deleted file mode 100644 index 2d5b1114d1..0000000000 Binary files a/server/lib/jetty/jetty-plus-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar b/server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar deleted file mode 100644 index c4f7eeefa9..0000000000 Binary files a/server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-schemas-3.1.2.jar b/server/lib/jetty/jetty-schemas-3.1.2.jar deleted file mode 100644 index 98666ed7a4..0000000000 Binary files a/server/lib/jetty/jetty-schemas-3.1.2.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-security-9.4.57.v20241219.jar b/server/lib/jetty/jetty-security-9.4.57.v20241219.jar deleted file mode 100644 index 425717e637..0000000000 Binary files a/server/lib/jetty/jetty-security-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-server-9.4.57.v20241219.jar b/server/lib/jetty/jetty-server-9.4.57.v20241219.jar deleted file mode 100644 index b06058476e..0000000000 Binary files a/server/lib/jetty/jetty-server-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar b/server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar deleted file mode 100644 index d80c631158..0000000000 Binary files a/server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-util-9.4.57.v20241219.jar b/server/lib/jetty/jetty-util-9.4.57.v20241219.jar deleted file mode 100644 index caeda5de3e..0000000000 Binary files a/server/lib/jetty/jetty-util-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar b/server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar deleted file mode 100644 index 1c064c3001..0000000000 Binary files a/server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar b/server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar deleted file mode 100644 index eed14c494b..0000000000 Binary files a/server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jetty-xml-9.4.57.v20241219.jar b/server/lib/jetty/jetty-xml-9.4.57.v20241219.jar deleted file mode 100644 index 0df6472e71..0000000000 Binary files a/server/lib/jetty/jetty-xml-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar b/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar deleted file mode 100644 index 6d77b3af39..0000000000 Binary files a/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar b/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar deleted file mode 100644 index 9176777787..0000000000 Binary files a/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar b/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar deleted file mode 100644 index d54786732b..0000000000 Binary files a/server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/org.eclipse.jdt.ecj-3.19.0.jar b/server/lib/jetty/jsp/org.eclipse.jdt.ecj-3.19.0.jar deleted file mode 100644 index 0b492c01f3..0000000000 Binary files a/server/lib/jetty/jsp/org.eclipse.jdt.ecj-3.19.0.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/org.mortbay.jasper.apache-el-8.5.70.jar b/server/lib/jetty/jsp/org.mortbay.jasper.apache-el-8.5.70.jar deleted file mode 100644 index 6eed4b62c1..0000000000 Binary files a/server/lib/jetty/jsp/org.mortbay.jasper.apache-el-8.5.70.jar and /dev/null differ diff --git a/server/lib/jetty/jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar b/server/lib/jetty/jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar deleted file mode 100644 index 8210ea768d..0000000000 Binary files a/server/lib/jetty/jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar and /dev/null differ diff --git a/server/lib/jms/geronimo-j2ee-management_1.1_spec-1.0.1.jar b/server/lib/jms/geronimo-j2ee-management_1.1_spec-1.0.1.jar deleted file mode 100644 index 0701ae0343..0000000000 Binary files a/server/lib/jms/geronimo-j2ee-management_1.1_spec-1.0.1.jar and /dev/null differ diff --git a/server/lib/jms/geronimo-jms_1.1_spec-1.1.1.jar b/server/lib/jms/geronimo-jms_1.1_spec-1.1.1.jar deleted file mode 100644 index 4f5e64643a..0000000000 Binary files a/server/lib/jms/geronimo-jms_1.1_spec-1.1.1.jar and /dev/null differ diff --git a/server/lib/jna-4.5.2.jar b/server/lib/jna-4.5.2.jar deleted file mode 100644 index 78e2058433..0000000000 Binary files a/server/lib/jna-4.5.2.jar and /dev/null differ diff --git a/server/lib/jna-platform-4.5.2.jar b/server/lib/jna-platform-4.5.2.jar deleted file mode 100644 index aa34419735..0000000000 Binary files a/server/lib/jna-platform-4.5.2.jar and /dev/null differ diff --git a/server/lib/joda-time-2.9.9.jar b/server/lib/joda-time-2.9.9.jar deleted file mode 100644 index b3080c4353..0000000000 Binary files a/server/lib/joda-time-2.9.9.jar and /dev/null differ diff --git a/server/lib/jsch-2.27.7.jar b/server/lib/jsch-2.27.7.jar deleted file mode 100644 index 10ea882d57..0000000000 Binary files a/server/lib/jsch-2.27.7.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-1.2-api-2.25.3.jar b/server/lib/log4j/log4j-1.2-api-2.25.3.jar deleted file mode 100644 index 680b5e1a8e..0000000000 Binary files a/server/lib/log4j/log4j-1.2-api-2.25.3.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-api-2.25.3.jar b/server/lib/log4j/log4j-api-2.25.3.jar deleted file mode 100644 index 640998bb34..0000000000 Binary files a/server/lib/log4j/log4j-api-2.25.3.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-core-2.25.3.jar b/server/lib/log4j/log4j-core-2.25.3.jar deleted file mode 100644 index a26e5b0164..0000000000 Binary files a/server/lib/log4j/log4j-core-2.25.3.jar and /dev/null differ diff --git a/server/lib/mybatis-3.1.1.jar b/server/lib/mybatis-3.1.1.jar deleted file mode 100644 index 2801833e89..0000000000 Binary files a/server/lib/mybatis-3.1.1.jar and /dev/null differ diff --git a/server/lib/oshi-core-3.9.1.jar b/server/lib/oshi-core-3.9.1.jar deleted file mode 100644 index 3209f1787a..0000000000 Binary files a/server/lib/oshi-core-3.9.1.jar and /dev/null differ diff --git a/server/lib/quartz-2.3.2.jar b/server/lib/quartz-2.3.2.jar deleted file mode 100644 index 8b7388287d..0000000000 Binary files a/server/lib/quartz-2.3.2.jar and /dev/null differ diff --git a/server/lib/rhino-1.7.13.jar b/server/lib/rhino-1.7.13.jar deleted file mode 100644 index 6433ffc3e7..0000000000 Binary files a/server/lib/rhino-1.7.13.jar and /dev/null differ diff --git a/server/lib/staxon-1.3.jar b/server/lib/staxon-1.3.jar deleted file mode 100644 index 7ba528985b..0000000000 Binary files a/server/lib/staxon-1.3.jar and /dev/null differ diff --git a/server/lib/swagger/ext/reflections-0.9.10.jar b/server/lib/swagger/ext/reflections-0.9.10.jar deleted file mode 100644 index c255641827..0000000000 Binary files a/server/lib/swagger/ext/reflections-0.9.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-annotations-2.0.10.jar b/server/lib/swagger/swagger-annotations-2.0.10.jar deleted file mode 100644 index cd67b28a2f..0000000000 Binary files a/server/lib/swagger/swagger-annotations-2.0.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-core-2.0.10.jar b/server/lib/swagger/swagger-core-2.0.10.jar deleted file mode 100644 index ad266bc263..0000000000 Binary files a/server/lib/swagger/swagger-core-2.0.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-integration-2.0.10.jar b/server/lib/swagger/swagger-integration-2.0.10.jar deleted file mode 100644 index 9578347e58..0000000000 Binary files a/server/lib/swagger/swagger-integration-2.0.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-jaxrs2-2.0.10.jar b/server/lib/swagger/swagger-jaxrs2-2.0.10.jar deleted file mode 100644 index b8797bc07b..0000000000 Binary files a/server/lib/swagger/swagger-jaxrs2-2.0.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-jaxrs2-servlet-initializer-2.0.10.jar b/server/lib/swagger/swagger-jaxrs2-servlet-initializer-2.0.10.jar deleted file mode 100644 index 4b1949020c..0000000000 Binary files a/server/lib/swagger/swagger-jaxrs2-servlet-initializer-2.0.10.jar and /dev/null differ diff --git a/server/lib/swagger/swagger-models-2.0.10.jar b/server/lib/swagger/swagger-models-2.0.10.jar deleted file mode 100644 index 7a9640153e..0000000000 Binary files a/server/lib/swagger/swagger-models-2.0.10.jar and /dev/null differ diff --git a/server/lib/velocity-engine-core-2.3.jar b/server/lib/velocity-engine-core-2.3.jar deleted file mode 100644 index 879a7b4d51..0000000000 Binary files a/server/lib/velocity-engine-core-2.3.jar and /dev/null differ diff --git a/server/lib/velocity-tools-generic-3.1.jar b/server/lib/velocity-tools-generic-3.1.jar deleted file mode 100644 index 40afab6de8..0000000000 Binary files a/server/lib/velocity-tools-generic-3.1.jar and /dev/null differ diff --git a/server/lib/xpp3-1.1.4c.jar b/server/lib/xpp3-1.1.4c.jar deleted file mode 100644 index 451ac82af4..0000000000 Binary files a/server/lib/xpp3-1.1.4c.jar and /dev/null differ diff --git a/server/lib/xstream-1.4.20.jar b/server/lib/xstream-1.4.20.jar deleted file mode 100644 index a8f7cd8028..0000000000 Binary files a/server/lib/xstream-1.4.20.jar and /dev/null differ diff --git a/server/mirth-build.properties b/server/mirth-build.properties deleted file mode 100644 index f4d82593f3..0000000000 --- a/server/mirth-build.properties +++ /dev/null @@ -1,8 +0,0 @@ -donkey=../donkey -server=../server -client=../client -cli=../command -version=4.6.0 - -# This value is used as the modified time for the files inside of jar, zip, and war files -archive.entry.date=1999-01-01T00:00:00.000Z diff --git a/server/mirth-build.xml b/server/mirth-build.xml index ff69752c53..4d3cb0fe70 100644 --- a/server/mirth-build.xml +++ b/server/mirth-build.xml @@ -1,188 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application version: ${version} - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +The Ant build has been replaced by Gradle. + + ./gradlew build (run from the repository root) + gradlew.bat build (on Windows) + +See CONTRIBUTING.md for build, test, and release commands. + + + 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/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/BrandingConstants.java b/server/src/main/java/com/mirth/connect/client/core/BrandingConstants.java similarity index 100% rename from server/src/com/mirth/connect/client/core/BrandingConstants.java rename to server/src/main/java/com/mirth/connect/client/core/BrandingConstants.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/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/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/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/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/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/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/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/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/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/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/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/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/ContentSearchElementToStringStyle.java b/server/src/main/java/com/mirth/connect/model/ContentSearchElementToStringStyle.java similarity index 100% rename from server/src/com/mirth/connect/model/ContentSearchElementToStringStyle.java rename to server/src/main/java/com/mirth/connect/model/ContentSearchElementToStringStyle.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/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/SearchElementToStringStyle.java b/server/src/main/java/com/mirth/connect/model/SearchElementToStringStyle.java similarity index 100% rename from server/src/com/mirth/connect/model/SearchElementToStringStyle.java rename to server/src/main/java/com/mirth/connect/model/SearchElementToStringStyle.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/Log4jMigrations.java b/server/src/main/java/com/mirth/connect/server/launcher/Log4jMigrations.java similarity index 100% rename from server/src/com/mirth/connect/server/launcher/Log4jMigrations.java rename to server/src/main/java/com/mirth/connect/server/launcher/Log4jMigrations.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/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/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/src/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReader.java b/server/src/main/java/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReader.java similarity index 100% rename from server/src/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReader.java rename to server/src/main/java/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReader.java diff --git a/server/src/com/eviware/soapui/resources/conf/soapui-log4j.xml b/server/src/main/resources/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/resources/com/eviware/soapui/resources/conf/soapui-log4j.xml diff --git a/server/src/com/mirth/connect/connectors/dimse/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/dimse/destination.xml diff --git a/server/src/com/mirth/connect/connectors/dimse/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/dimse/source.xml diff --git a/server/src/com/mirth/connect/connectors/doc/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/doc/destination.xml diff --git a/server/src/com/mirth/connect/connectors/file/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/file/destination.xml diff --git a/server/src/com/mirth/connect/connectors/file/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/file/source.xml diff --git a/server/src/com/mirth/connect/connectors/http/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/http/destination.xml diff --git a/server/src/com/mirth/connect/connectors/http/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/http/source.xml diff --git a/server/src/com/mirth/connect/connectors/jdbc/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/jdbc/destination.xml diff --git a/server/src/com/mirth/connect/connectors/jdbc/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/jdbc/source.xml diff --git a/server/src/com/mirth/connect/connectors/jms/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/jms/destination.xml diff --git a/server/src/com/mirth/connect/connectors/jms/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/jms/source.xml diff --git a/server/src/com/mirth/connect/connectors/js/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/js/destination.xml diff --git a/server/src/com/mirth/connect/connectors/js/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/js/source.xml diff --git a/server/src/com/mirth/connect/connectors/smtp/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/smtp/destination.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/tcp/destination.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/tcp/plugin.xml diff --git a/server/src/com/mirth/connect/connectors/tcp/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/tcp/source.xml diff --git a/server/src/com/mirth/connect/connectors/vm/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/vm/destination.xml diff --git a/server/src/com/mirth/connect/connectors/vm/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/vm/source.xml diff --git a/server/src/com/mirth/connect/connectors/ws/destination.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/ws/destination.xml diff --git a/server/src/com/mirth/connect/connectors/ws/source.xml b/server/src/main/resources/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/resources/com/mirth/connect/connectors/ws/source.xml diff --git a/server/src/com/mirth/connect/plugins/dashboardstatus/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/dashboardstatus/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datapruner/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datapruner/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/delimited/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/delimited/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/dicom/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/dicom/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/edi/edi-to-xml-mapping.xml b/server/src/main/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/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/resources/com/mirth/connect/plugins/datatypes/edi/xml/map.xsd diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/hl7v2/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/hl7v3/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/json/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/json/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/ncpdp/ncpdp.xsd b/server/src/main/resources/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/resources/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/resources/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/resources/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/resources/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/resources/com/mirth/connect/plugins/datatypes/ncpdp/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/raw/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/raw/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/datatypes/xml/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/datatypes/xml/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/destinationsetfilter/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/destinationsetfilter/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/dicomviewer/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/dicomviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/directoryresource/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/directoryresource/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/globalmapviewer/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/globalmapviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/httpauth/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/httpauth/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/imageviewer/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/imageviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/javascriptrule/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/javascriptrule/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/javascriptstep/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/javascriptstep/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/mapper/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/mapper/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/messagebuilder/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/messagebuilder/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/mllpmode/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/mllpmode/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/pdfviewer/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/pdfviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/rulebuilder/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/rulebuilder/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/scriptfilerule/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/scriptfilerule/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/scriptfilestep/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/scriptfilestep/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/serverlog/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/serverlog/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/textviewer/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/textviewer/plugin.xml diff --git a/server/src/com/mirth/connect/plugins/xsltstep/plugin.xml b/server/src/main/resources/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/resources/com/mirth/connect/plugins/xsltstep/plugin.xml diff --git a/server/src/com/mirth/connect/util/EXPORTREADME.txt b/server/src/main/resources/com/mirth/connect/util/EXPORTREADME.txt similarity index 100% rename from server/src/com/mirth/connect/util/EXPORTREADME.txt rename to server/src/main/resources/com/mirth/connect/util/EXPORTREADME.txt diff --git a/server/src/com/mirth/connect/util/beautify-1.15.3.js b/server/src/main/resources/com/mirth/connect/util/beautify-1.15.3.js similarity index 100% rename from server/src/com/mirth/connect/util/beautify-1.15.3.js rename to server/src/main/resources/com/mirth/connect/util/beautify-1.15.3.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/ConnectServiceUtilTest.java b/server/src/test/java/com/mirth/connect/client/core/ConnectServiceUtilTest.java similarity index 100% rename from server/test/com/mirth/connect/client/core/ConnectServiceUtilTest.java rename to server/src/test/java/com/mirth/connect/client/core/ConnectServiceUtilTest.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/ContentSearchElementToStringStyleTest.java b/server/src/test/java/com/mirth/connect/model/ContentSearchElementToStringStyleTest.java similarity index 100% rename from server/test/com/mirth/connect/model/ContentSearchElementToStringStyleTest.java rename to server/src/test/java/com/mirth/connect/model/ContentSearchElementToStringStyleTest.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/MessageFilterToStringStyleTest.java b/server/src/test/java/com/mirth/connect/model/MessageFilterToStringStyleTest.java similarity index 100% rename from server/test/com/mirth/connect/model/MessageFilterToStringStyleTest.java rename to server/src/test/java/com/mirth/connect/model/MessageFilterToStringStyleTest.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/SearchElementToStringStyleTest.java b/server/src/test/java/com/mirth/connect/model/SearchElementToStringStyleTest.java similarity index 100% rename from server/test/com/mirth/connect/model/SearchElementToStringStyleTest.java rename to server/src/test/java/com/mirth/connect/model/SearchElementToStringStyleTest.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/filters/elements/ContentSearchElementTest.java b/server/src/test/java/com/mirth/connect/model/filters/elements/ContentSearchElementTest.java similarity index 100% rename from server/test/com/mirth/connect/model/filters/elements/ContentSearchElementTest.java rename to server/src/test/java/com/mirth/connect/model/filters/elements/ContentSearchElementTest.java diff --git a/server/test/com/mirth/connect/model/filters/elements/MetaDataSearchElementTest.java b/server/src/test/java/com/mirth/connect/model/filters/elements/MetaDataSearchElementTest.java similarity index 100% rename from server/test/com/mirth/connect/model/filters/elements/MetaDataSearchElementTest.java rename to server/src/test/java/com/mirth/connect/model/filters/elements/MetaDataSearchElementTest.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/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/launcher/Log4jMigrationsTest.java b/server/src/test/java/com/mirth/connect/server/launcher/Log4jMigrationsTest.java similarity index 100% rename from server/test/com/mirth/connect/server/launcher/Log4jMigrationsTest.java rename to server/src/test/java/com/mirth/connect/server/launcher/Log4jMigrationsTest.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/userutil/DestinationSetTest.java b/server/src/test/java/com/mirth/connect/server/userutil/DestinationSetTest.java similarity index 100% rename from server/test/com/mirth/connect/server/userutil/DestinationSetTest.java rename to server/src/test/java/com/mirth/connect/server/userutil/DestinationSetTest.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/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/net/lingala/zip4j/unzip/UnzipEngineTest.java diff --git a/server/test/net/lingala/zip4j/unzip/UnzipTest.java b/server/src/test/java/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/net/lingala/zip4j/unzip/UnzipTest.java diff --git a/server/test/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReaderTest.java b/server/src/test/java/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReaderTest.java similarity index 100% rename from server/test/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReaderTest.java rename to server/src/test/java/org/openintegrationengine/engine/plugins/datatypes/AbstractXMLReaderTest.java diff --git a/server/test/com/mirth/connect/server/controllers/Config 1.xml b/server/src/test/resources/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/resources/com/mirth/connect/server/controllers/Config 1.xml diff --git a/server/test/resources/notifications-empty.json b/server/src/test/resources/notifications-empty.json similarity index 100% rename from server/test/resources/notifications-empty.json rename to server/src/test/resources/notifications-empty.json diff --git a/server/test/resources/notifications-populated.json b/server/src/test/resources/notifications-populated.json similarity index 100% rename from server/test/resources/notifications-populated.json rename to server/src/test/resources/notifications-populated.json diff --git a/server/testlib/byte-buddy-1.14.13.jar b/server/testlib/byte-buddy-1.14.13.jar deleted file mode 100644 index 791db5e61f..0000000000 Binary files a/server/testlib/byte-buddy-1.14.13.jar and /dev/null differ diff --git a/server/testlib/byte-buddy-agent-1.14.13.jar b/server/testlib/byte-buddy-agent-1.14.13.jar deleted file mode 100644 index 3223ba8933..0000000000 Binary files a/server/testlib/byte-buddy-agent-1.14.13.jar and /dev/null differ diff --git a/server/testlib/hamcrest-2.2.jar b/server/testlib/hamcrest-2.2.jar deleted file mode 100644 index 71065788d5..0000000000 Binary files a/server/testlib/hamcrest-2.2.jar and /dev/null differ diff --git a/server/testlib/junit-4.13.1.jar b/server/testlib/junit-4.13.1.jar deleted file mode 100644 index b376ffc16f..0000000000 Binary files a/server/testlib/junit-4.13.1.jar and /dev/null differ diff --git a/server/testlib/mockito-core-5.1.1.jar b/server/testlib/mockito-core-5.1.1.jar deleted file mode 100644 index 234bea1474..0000000000 Binary files a/server/testlib/mockito-core-5.1.1.jar and /dev/null differ diff --git a/server/testlib/mockito-inline-5.1.1.jar b/server/testlib/mockito-inline-5.1.1.jar deleted file mode 100644 index 33dd71b507..0000000000 Binary files a/server/testlib/mockito-inline-5.1.1.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..2d6353ad85 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,7 @@ +rootProject.name = 'open-integration-engine' + +include 'donkey' +include 'server' +include 'client' +include 'command' +include 'generator'