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..0c2617ac77 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 -DdisableSigning=true -Dcoverage=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..fb7323dbd8 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,10 @@ donkey/donkey-test # /server/src/org/mozilla/javascript/ # /server/src/org/mozilla/javascript/xmlimpl/ +server/setup.tar.gz +server/certchain.pem +dependency-check-report.html +dependency-check-report.json +tools/install4j/oie-installer-config.install4j~ +yubikey-pkcs11.cfg +certchain.pem 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/BUILD-MIGRATION.md b/BUILD-MIGRATION.md new file mode 100644 index 0000000000..a7084816a8 --- /dev/null +++ b/BUILD-MIGRATION.md @@ -0,0 +1,523 @@ +# The Ant-to-Gradle Migration and How to Verify It + +**The short version:** + +- The build system changed from Ant to Gradle. **The product it builds + did not change**, and that claim is checkable: the output of both + builds was compared archive by archive, file by file. +- 374 of the 419 library jars that used to be stored in the repository + are now downloaded from Maven Central instead, and each one was + accepted only after proving it is **the exact same file, bit for + bit** (same SHA-1 fingerprint). The other 45 stay in the repository, + each with a documented reason (listed in the appendix). +- Every check on the build's output ships in the repository, so any + reviewer can re-run the verification rather than trust this + document. The recipe is at the bottom. +- Substantial parts of this work were produced with AI assistance as + a process experiment. The controls that made that safe, and the + errors those controls caught, are described below. + +## Why one change instead of piecemeal + +None of the direction here is new. Nico Piel proposed the move to a +dependency-managed build (#52) and drove three successive Gradle +attempts (#54, #100, #214); jessesaga built a fourth (#243). In those +reviews Mitch Gaffigan named the bar a one-step replacement would +have to clear, byte-identical output, and he wrote the verification +toolkit this branch is cross-checked with. The three-commit structure +follows the reviewable-commit standard Tony Germano held the +project's last large dependency change (#146) to. This branch is +built on that groundwork. + +The incremental path (wrap the old build first, convert one piece at +a time) is the default for a reason: replacing a build system in one +step is reckless **when you can't prove the output is the same**. + +This branch takes the other path because the risk became measurable. +The bar is met, and here is exactly what "identical" means, including +everything that is *not* identical: + +- **Every archive in the distribution, 490 of 490, has identical + contents** to an Ant build of this branch's parent commit. Four + things differ, all of them build-tool fingerprints rather than + product content. (1) 121 archives carry a label inside saying which + Ant version built them, which Gradle doesn't write; (2) file + timestamps inside those same 121 archives, the ones the build itself + writes, differ, because both tools stamp a fixed fake date for + reproducibility and they chose different dates (Ant: + 1999-01-01, Gradle: its own constant), while third-party jars pass + through byte-identical; (3) one small + file (`version.properties`) embeds the build timestamp, so it + differs between any two builds, including two Ant builds run back + to back; (4) two jars contain one extra folder *entry* (not a file). + Every class file, resource, script, and configuration byte is the + same. The comparison tool classifies each of these categories + itself; nothing was waved through by hand. +- **All 654 tests pass, and the list of test classes that ran is + identical** to the Ant build's, class for class. One heads-up: the + test counter shown in CI will drop to roughly half its historical + "runs" number. That's because the old build accidentally wrote a + duplicate results file that made CI count every test twice. The true + count was always 654. +- **The already-published v4.6.0-rc1 release was cross-checked** against + a local Ant build of the same source code: 473 of 490 archives are + bit-for-bit identical. The 17 that differ are all explained by the + release pipeline itself, not by compilation. Sixteen are third-party jars + that the release's signing step repackaged (the packaging tool + rewrites one bookkeeping file, `module-info.class`, when it touches + a jar), and one (`PDFRenderer.jar`) gained a manifest line in the + same step. None of the 17 differ in compiled code. The release file + also contains installer files added after the build by the installer + tool, and signature files, which can never match between any two + builds because each signing run gets a fresh timestamp from a + timestamp authority. +- **The signing path works end to end**: all 216 jars that ship signed + were signed by the new build and pass Java's signature verifier + (`jarsigner -verify`). The verifier's strict mode adds a warning + about the certificate being self-signed, which is a property of the + development keystore in the repository, not of the build; the old + build's output warns identically. +- **The built product boots and runs.** A human boot test of the + Gradle-built `server/setup` started the server and ran it normally, + a quick functional check, not a full regression pass (an earlier + automated attempt was discarded as contaminated; see the error + ledger). With every archive proven content-identical, this is a + sanity check on top of the archive comparison. + +Once equivalence is proven, piecemeal is the riskier path: months of +running two build systems side by side, kept in sync by hand, with no +moment at which "they produce the same thing" is ever demonstrated. A +verified cutover is one reviewable event with the proof attached, and +it is still split into three commits, file moves, build swap, +dependency swap, so each concern can be reviewed on its own. + +## What changed + +1. **File moves** (commit 1): 1,806 source files moved to the standard + directory layout that Gradle and most modern Java tools expect + (`src/main/java`, `src/test/java`, and so on). git's rename detection + confirms every one is a pure move, zero lines added, zero removed: + `git show --stat -M100%` on the commit. +2. **The build swap** (commit 2): the new Gradle build, using a + "wrapper" script committed to the repository, so contributors don't + install Gradle; the wrapper downloads a pinned, checksum-verified + copy. Everything lands where it always did: the runnable product in + `server/setup`, the extension zips in `server/dist`. The Ant entry + points (`server/build.xml`, `server/mirth-build.xml`) are replaced + by stubs that print "this moved to ./gradlew" if anyone runs them; + the subproject Ant files they drove are deleted. CI, the Dockerfile, and the contributor docs all + use the new build. The developer conveniences that used to live in + Eclipse project files are now build commands (`devRun`, + `devLauncher`, `devClient`, `createDerbyDb`). +3. **The dependency swap** (commit 3): the 374 verified jars come from + Maven Central; the 45 unverifiable files (32 distinct libraries) + stay in the repository with per-jar reasons recorded: thirteen are + content-identical to public copies but repackaged, three are + genuinely modified locally, and sixteen were never published to + Maven Central at all, one of them built in-house (the appendix + lists every one). Three safeguards come with it: every download is + checked against a recorded fingerprint on every build; the build + fails loudly if a jar would silently go missing from the shipped + product; and the helper-library automation is kept off so the set + of shipped files cannot drift (see Limitations). + +## What the distribution looks like + +The shape of `server/setup`, identical from either build system +(counts generated from the built tree): + +``` +server/setup/ + cli-lib/ 55 files, 55 jars + client-lib/ 91 files, 91 jars + conf/ 8 files + docs/ 102 files + extensions/ 176 files, 125 jars, 40 extensions + logs/ 0 files + public_api_html/ 53 files + public_html/ 3 files + server-launcher-lib/ 0 files + server-lib/ 217 files, 217 jars + configure-from-env + mirth-cli-launcher.jar + mirth-server-launcher.jar + oieserver + oieserver.ps1 + oieserver.vmoptions + oieservice.vmoptions +``` + +The diff between the Ant-built and Gradle-built trees, both built the +same day from the same commit: + +```bash +$ diff <(cd ant-setup && find . -type f | sort) \ + <(cd gradle-setup && find . -type f | sort) +$ # empty: same files, same paths, same names + +$ python3 tools/build-parity/compare_builds.py ant-setup gradle-setup +Common files: 712 (490 jars/zips) +Byte-identical files: 591 +Jars/zips with fully identical entry contents: 490 / 490 +Manifests differing only in Ant-Version/Created-By: 121 +version.properties differing only in timestamp comment: 3 + +Directory-entry-only differences (2): + client-lib/mirth-client.jar: dir entries ant-only=[] gradle-only=['com/mirth/connect/connectors/'] + server-lib/mirth-server.jar: dir entries ant-only=[] gradle-only=['com/mirth/connect/connectors/'] + +REAL differences (0): +``` + +The complete inventory of what is not byte-identical, and why each +category exists: + +| What differs | Where | Why | +|---|---|---| +| A "built by Ant version X" label inside archives | 121 archives | Ant stamps its tool version into archives; Gradle doesn't | +| Timestamps on files inside archives | the same 121 archives the build writes | both tools stamp a fixed fake date for reproducibility; they picked different dates; third-party jars pass through untouched | +| The build date in `version.properties` | 3 copies of one file | it embeds the day of the build; two same-day **Ant** builds differ here too | +| One extra folder entry | 2 jars | Gradle records a parent-folder entry Ant omitted | + + +## How mistakes are caught before they ship + +An obvious failure mode in a build with several coordinated files +(the dependency list, the placement map, the fingerprint file): one +gets updated and another forgotten. The design rule +used everywhere: **a mismatch must stop the build with a clear +message, never surface later as a broken product.** + +- Update a library version but forget to refresh the fingerprints? The + build fails before compiling anything, naming the library. +- A downloaded jar that has no assigned place in the shipped product? + The build fails and names it, instead of quietly shipping without it. +- The startup files that list specific jar names are generated from + the actual resolved versions, so they can't go stale (the old build + had them hardcoded, and they *could*). +- Changing a library version is two steps, and forgetting either one + is a build failure with instructions: edit one line in + `gradle/libs.versions.toml`, then refresh the checksum metadata + (the exact command, and why it must run with a cold cache, is in + CONTRIBUTING). + +For changes to the build logic itself, CONTRIBUTING documents a +five-minute habit: fingerprint the built product before your change +and after (`./gradlew snapshotDistribution`), diff the two, and +confirm that only what you intended to change actually changed. + +## How this was built + +Substantial parts of this migration were produced with AI assistance: +the Gradle build scripts, the comparison and provenance tooling in +`tools/build-parity/`, the dependency audit, and the drafts of this +document. The experiment: can AI-driven work of this size be held to +machine-checked claims rather than taken on trust? The controls: + +1. **The pass/fail bar was set before the work began**: the new build's + output must match the old one, verified by machine. Every aggressive + step (deleting 374 jars, moving 1,806 files, removing the old build + system) happened behind that gate, and the gate caught real mistakes + during development; the ledger below lists them. +2. **Machine claims were treated as unproven until re-executed.** This + caught real errors. +3. **Every internal review ran its findings through a second, + adversarial pass** whose job was to disprove them. Both passes were + AI sessions; the second was started fresh, with none of the first + one's context. The second pass re-ran the commands instead of + trusting the first report. The ledger below shows one at work: the + disproven "zero deprecation warnings" claim. +4. **Independent tooling.** The primary comparison tool + (`tools/build-parity/compare_builds.py`) was itself written as part + of this AI-assisted work, so passing it is partly self-grading. For + that reason the output was additionally verified with + [oie-release-verifier](https://github.com/mgaffigan/oie-release-verifier), + the release-checking toolkit Mitch Gaffigan wrote for a different + purpose (details in `tools/build-parity/README.md`). +5. **A human approved every irreversible step.** Reversible steps were + automated; pushes, publications, and deletions required a person + confirming the exact command. Approving commands is not code + review, and neither is the output-equivalence proof. The build + logic itself still needs human eyes, and the three-commit structure + exists for that: the build swap is one readable unit, sized to be + understood line by line before it merges. +6. **Discretionary improvements were kept out, even provably safe + ones.** This change rests on one claim, "nothing changed", and + every optional improvement folded in makes that claim harder to + verify. Example: thirteen vendored jars + turned out to be content-identical to their public copies and could + safely become downloaded dependencies (see the appendix), and they + were still left untouched here. Improvements like that are queued as + small follow-ups behind the verification tooling this change leaves + in the repository, where each one is independently checkable. + +## The error ledger + +These are the mistakes made during this work, and what caught each +one: + +- An early wrong guess by the AI blamed a compiler path setting for + output differences; the real cause was a compiler feature being + silently disabled by Gradle's defaults. The output comparison + (control 1) caught the difference; experiments found the true cause. +- The AI wrongly classified three libraries as "not available on Maven + Central." Re-execution (control 2) caught it, and the cause matters: + Maven Central's *search index* is missing fingerprint + records for some files, so "no match found" from the search must be + double-checked against the actual download server before being + believed. +- An AI refactor accidentally dropped eleven historically renamed jars + from the shipped product. The output comparison (control 1) flagged + all eleven on the next run. +- An internal AI review claimed the build produced "zero deprecation + warnings." A later cold review (a fresh AI session, given no context + and told to verify everything) re-ran the command and proved that + claim false, the build used a pattern that the next major Gradle + version removes. The build was restructured; running it with + `--warning-mode all` now shows none of the patterns the next major + version removes (one further-out item remains, listed under + limitations). +- The AI's first boot-test of the built server ran while another + server instance was live on the same machine, so its "it boots and + responds" result could not be attributed to the new build. A human + caught that one (no automated control did), the claim was withdrawn, + and runtime testing moved to a human-run boot, which succeeded: the + server started and ran normally in a quick functional check. +- The dependency checksum inventory was first generated on a warm + local cache and without CI's coverage flag, so it was missing + entries for parent POMs and the JaCoCo agent that only a cold-cache + run resolves. The fail-closed gate stopped the pull request's first + CI run within seconds. The inventory was regenerated from a cold + cache with CI's exact flags, and CONTRIBUTING now tells the next + person to refresh it that way. +- Project lore (repeated by the AI in early drafts of this document) + held that the HAPI 2.3 jars were locally patched. A human question + prompted an entry-by-entry comparison: they are content-identical to + the public copies, only repackaged. The same check found the search + API's version list silently omits older versions, which had caused + one jar to be wrongly labeled "never published." + +## Known limitations + +- **Adding a new library takes more manual work than in a typical + Gradle project.** Modern builds automatically fetch the helper + libraries each library needs. That automation is switched off here: + this build downloads exactly the 374 files the old build + shipped, nothing extra, so the product provably could not change. + The cost shows up only when someone adds a brand-new library: they + must list its helpers by hand, and the build tells them when one is + missing. The way out is gradual: whenever a library is upgraded + anyway, switch the automation on for just that library and check the + result with the comparison tool. (Technical name: non-transitive + resolution.) +- **The build logic is centralized and plain, not idiomatic.** It is + a few large Groovy files that transcribe the old Ant build + one-to-one, with no unit tests of their own; correctness is guarded + by the output comparison and the fingerprint habit above. Gradle + idiom would restructure this into tested convention plugins, + possibly in the Kotlin DSL. That restructuring is left for its own + change, after this one proves the outputs. +- **One optional Gradle speed feature doesn't work with this build + yet.** Gradle can cache its own startup work to make repeat builds + faster (the "configuration cache"). Some of our build steps use an + older style that this feature rejects, and one of those calls is + slated for removal in Gradle 10, which is years away. Today's build + pins Gradle 8.14.1 and is unaffected. This is cleanup for a future + change, and it is tracked. +- **Signed release builds are about five minutes slower.** The old + build signed four jars at a time; this one signs them one at a time. + Only release builds with signing enabled notice; everyday development + builds skip signing entirely. +- **Of the three commits, only the last one builds.** The middle + commit (the build-system swap) refers to the dependency files the + third commit introduces. Anyone using git's per-commit testing + (bisect) will hit that one commit; it is split this way so each part + can be *read* in isolation, which mattered more for review. +- **A few test classes have never run, before or after.** Classes + whose names end in "Tests" (plural) don't match the test pattern, + which only picks up names ending in "Test". That was true under Ant + and is preserved unchanged here so this change alters nothing. + Fixing it is a separate, simple follow-up. +- **The equivalence proof covers the cutover day only.** It proves the + new build produced the same product as the old one at handover. It + cannot prove anything about future changes. + What protects every day after: each downloaded library is checked + against a recorded fingerprint on every build; the build fails if a + file would silently go missing from the distribution; the 654 tests + run on every build; and CONTRIBUTING documents the five-minute + fingerprint habit for anyone changing build logic. +- **Output claims are verifiable; the process claims are not.** Every claim + about the build's output can be verified by running the commands + below. The claims about how the work was done (the controls, the + error ledger) cannot be checked: there are no records to run, so + that part is take-the-author's-word. It also doesn't matter: even a + reader who ignores the process story entirely can verify the build + the same way. + +## Appendix: the 45 jars that stay in the repository + +Generated from the committed audit record +(`tools/build-parity/jar-provenance.json`), which records each jar's +fingerprint, size, status, and the reason it stays. Jars present in +more than one module are listed once with all locations. + +### Same contents as the public copy, different wrapper + +A jar is a zip container. Each of these was unpacked and compared +file by file against its Maven Central copy: every file inside is +identical. The +jar file itself still fingerprints differently, because zip containers +also record packing order, timestamps, and compression choices. The +replacement rule in this migration was strict, the whole +downloaded file had to be bit-for-bit identical to the vendored one, +so these stayed in the repository. + +Follow-up for this group: since these jars are +proven content-identical to their public copies, they could safely +move to downloaded dependencies later, the proof that it changes +nothing already exists. The repository would shrink accordingly; the +HAPI set alone is stored twice today (client and server keep separate +copies, 18 files), and would become nine references fetched once and +placed into both distribution directories at build time. They stay +vendored in this change only because the adoption rule was strict +file-level identity, and this change promises to alter nothing. The +thirteen: + +| Jar | Module(s) | +|---|---| +| `autocomplete-2.5.4.jar` | client | +| `hapi-base-2.3.jar` | client+server | +| `hapi-structures-v21-2.3.jar` | client+server | +| `hapi-structures-v22-2.3.jar` | client+server | +| `hapi-structures-v23-2.3.jar` | client+server | +| `hapi-structures-v231-2.3.jar` | client+server | +| `hapi-structures-v24-2.3.jar` | client+server | +| `hapi-structures-v25-2.3.jar` | client+server | +| `hapi-structures-v251-2.3.jar` | client+server | +| `hapi-structures-v26-2.3.jar` | client+server | +| `jtds-1.3.1.jar` | donkey+server | +| `rsyntaxtextarea-2.5.6.jar` | client | +| `sqlite-jdbc-3.43.2.1.jar` | server | + +### Genuinely changed from the public copy + +These three were unpacked and compared the same way, and the +differences are real: compiled code inside differs from the copy on +Maven Central (114 classes in +`javaparser`, 60 in `zip4j`, 2 in `not-going-to-be-commons-ssl`). +These are local forks; replacing them with a download would change the +product. + +The follow-up these need is archaeology, not packaging: recover why +each was changed, then either carry the change forward onto a current +version, get it upstreamed, or replace the library. Until someone does +that, they must stay vendored. The three: + +| Jar | Module(s) | +|---|---| +| `javaparser-1.0.8.jar` | client | +| `not-going-to-be-commons-ssl-0.3.18.jar` | server | +| `zip4j_1.3.3.jar` | client+server | + +### Nothing on Maven Central to replace them with + +Some of these never appeared on Maven Central at all; for the rest, +every version Maven Central has ever offered under the same name was +fingerprint-checked and none matches our bytes. The check was scoped +to Maven Central: copies hosted in other repositories (or +shown by aggregator sites like mvnrepository.com, which index far more +than Central) were never candidates, because this build resolves from +Maven Central and nowhere else. The per-version sweep was a one-time +manual effort; `tools/build-parity/sweep_provenance.py +--classify-none` re-probes it, subject to the search-index caveat +documented in `tools/build-parity/README.md`. + +There is no mechanical follow-up here: moving any of these to a +download would mean switching to a different version with different +bytes, which is an upgrade decision, not a packaging +cleanup. The ten: + +| Jar | Module(s) | +|---|---| +| `PDFRenderer.jar` | server | +| `backport-util-concurrent-Java60-3.1.jar` | server | +| `istack-commons-runtime-3.0.6.jar` | client+server | +| `jai_imageio.jar` | client+server | +| `language_support.jar` | client | +| `looks-2.3.1.jar` | client | +| `openjfx.jar` | client | +| `webdavclient4j-core-0.92.jar` | server | +| `wizard.jar` | client | +| `wsdl4j-1.6.2-fixed.jar` | server | + +### Known origins outside Maven Central + +The five dcm4che jars came from the dcm4che.org project site, which +never published this series +to Maven Central; `mirth-vocab.jar` is built in-house by this +repository's own generator module. + +The dcm4che set is in the same position as the group above: vendored +until someone chooses an upgrade. `mirth-vocab.jar` has a cleaner +follow-up, since this repository can already build it from source; the +open question is only whether a rebuild reproduces the shipped jar +exactly. The six: + +| Jar | Module(s) | +|---|---| +| `dcm4che-core-2.0.29.jar` | server | +| `dcm4che-filecache-2.0.29.jar` | server | +| `dcm4che-net-2.0.29.jar` | server | +| `dcm4che-tool-dcmrcv-2.0.29.jar` | server | +| `dcm4che-tool-dcmsnd-2.0.29.jar` | server | +| `mirth-vocab.jar` | server | + +32 distinct jars, 45 files in total across modules. + +## How to re-verify + +The complete check needs JDK 17, Apache +Ant (the acceptance run used 1.10.14), Python 3, and network access +for the first Gradle run, which downloads Gradle itself and the 374 +dependencies, all checksum-verified; the Ant baseline builds offline +from the vendored jars. Run it from the root of this branch: + +```bash +# Ant baseline at the migration's parent commit (this branch is three +# commits; its parent is 8c1111ba3) +git worktree add /tmp/oie-ant 8c1111ba3 +(cd /tmp/oie-ant/server && ant -f mirth-build.xml -DdisableSigning=true -DdisableTests=true build) + +# Gradle build of this branch. Use the same JDK build for both builds +# (compiled classes differ across JDK builds) and the same calendar +# day (version.properties embeds the build date). +./gradlew clean build dist -DdisableSigning=true + +# Compare every archive, entry by entry +python3 tools/build-parity/compare_builds.py /tmp/oie-ant/server/setup server/setup + +# Cleanup (also clears a failed earlier attempt) +git worktree remove --force /tmp/oie-ant +``` + +Expected: `REAL differences (0)`; the comparison classifies the known +tool-fingerprint deltas itself. For scale: the Ant baseline builds in +seconds; that is normal, not a short-circuit. The Gradle build takes a +few minutes with warm caches and runs the full test suite. The +worktree costs about a gigabyte of disk until removed. + +One expected wrinkle: a successful Gradle build ends with Gradle's +stock banner about deprecated features being "incompatible with +Gradle 9.0." Running with `--warning-mode all` shows what it actually +refers to: the one disclosed item under Known limitations, a call +scheduled for removal in Gradle 10, not 9; the banner's text is +generic. + +The dependency audit is re-checkable with +`python3 tools/build-parity/sweep_provenance.py --verify-exact`, which +re-downloads every matched jar's checksum from Maven Central; expect +`0 mismatches`. Every build also re-verifies fingerprints and +placements as a side effect of building. The remaining evidence +routes, the independent release-verifier toolkit, the signed-build +check, and the published-rc1 cross-check, each have their own recipe +in `tools/build-parity/README.md`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4cfe9630b..495eb709c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,8 +26,52 @@ 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 -DdisableSigning=true # full build without jar signing +./gradlew test # run the unit tests (-Dcoverage=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`. + +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 -DdisableSigning=true -Dcoverage=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 happened; see the migration write-up's error ledger). 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), use the snapshot protocol: + +```bash +./gradlew build snapshotDistribution -DdisableSigning=true +cp build/distribution-snapshot.txt /tmp/before.txt +# ... make your build-logic change ... +./gradlew build snapshotDistribution -DdisableSigning=true +diff /tmp/before.txt build/distribution-snapshot.txt +``` + +Only the changes you intended should appear. For archive-level analysis +of a difference, use `tools/build-parity/compare_builds.py` on two +setup trees. + +### 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..4f7c2dabb9 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="-DdisableSigning=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..d94d5171d8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,416 @@ +/* + * 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 (tools/build-parity). 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 (see tools/build-parity/README.md). 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, and one extra directory entry in mirth-client.jar + * and mirth-server.jar. + * + * Usage mirrors the Ant build: + * ./gradlew build full build + tests + * ./gradlew build -DdisableTests=true skip tests + * ./gradlew build -DdisableSigning=true skip jar signing + * ./gradlew test [-Dcoverage=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 } +} + +// -D and -P both work for the historical build flags. +def flag = { String name -> + (System.getProperty(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; -Dversion=x.y.z overrides + version = System.getProperty('version') ?: 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 + } + + // Ant's javac task writes an empty package-info.class for every + // package-info.java that javac itself produced no class for (it has + // no package annotations). Those classes ship in the jars; recreate + // them byte-for-byte (same minimal class file Ant generates). + def generatePackageInfoClasses = { sourceDirs, File destDir -> + sourceDirs.each { File srcDir -> + if (!srcDir.directory) { + return + } + fileTree(dir: srcDir, include: '**/package-info.java').each { File src -> + String pkgPath = srcDir.toPath().relativize(src.toPath().parent).toString().replace(File.separatorChar, '/' as char) + File classFile = new File(destDir, "${pkgPath}/package-info.class") + if (!classFile.exists()) { + classFile.parentFile.mkdirs() + classFile.withDataOutputStream { o -> + o.writeInt(0xCAFEBABE as int) + o.writeShort(0) // minor + o.writeShort(49) // major (Java 5, same as Ant) + o.writeShort(7) // constant pool count + o.writeByte(7); o.writeShort(5) // #1 Class -> #5 + o.writeByte(7); o.writeShort(6) // #2 Class -> #6 + o.writeByte(1); o.writeUTF('SourceFile') // #3 + o.writeByte(1); o.writeUTF('package-info.java') // #4 + o.writeByte(1); o.writeUTF("${pkgPath}/package-info".toString()) // #5 + o.writeByte(1); o.writeUTF('java/lang/Object') // #6 + o.writeShort(0x0200) // ACC_INTERFACE + o.writeShort(1) // this_class + o.writeShort(2) // super_class + o.writeShort(0); o.writeShort(0); o.writeShort(0) + o.writeShort(1) // one attribute: SourceFile + o.writeShort(3); o.writeInt(2); o.writeShort(4) + } + } + } + } + } + compileJava.doLast { + generatePackageInfoClasses(sourceSets.main.java.srcDirs, destinationDirectory.get().asFile) + } + compileTestJava.doLast { + generatePackageInfoClasses(sourceSets.test.java.srcDirs, destinationDirectory.get().asFile) + } + + // 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 = 'Writes the resolved external runtime artifacts as JSON for cross-project staging.' + 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 -Dcoverage=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' +} + +// Writes one SHA line per file of the staged distribution to +// build/distribution-snapshot.txt. The protocol for changing build +// logic: snapshot, make the change, build, snapshot again, diff. Only +// the changes you intended should appear (see CONTRIBUTING.md). +tasks.register('snapshotDistribution') { + group = 'verification' + description = 'Writes a SHA-256 line per file of server/setup for before/after comparison of build changes.' + outputs.upToDateWhen { false } + doLast { + def setupDir = file('server/setup') + if (!setupDir.directory) { + throw new GradleException('server/setup does not exist; run ./gradlew build first') + } + def out = new StringBuilder() + def md = java.security.MessageDigest.getInstance('SHA-256') + setupDir.eachFileRecurse(groovy.io.FileType.FILES) { f -> + md.reset() + f.withInputStream { ins -> + byte[] buf = new byte[1 << 20] + int n + while ((n = ins.read(buf)) > 0) { + md.update(buf, 0, n) + } + } + def rel = setupDir.toPath().relativize(f.toPath()) + out.append(md.digest().encodeHex()).append(' ').append(rel).append('\n') + } + def target = file('build/distribution-snapshot.txt') + target.parentFile.mkdirs() + target.text = out.readLines().sort().join('\n') + '\n' + logger.lifecycle "snapshot written: ${target} (${target.readLines().size()} files)" + } +} + +// 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..5250ccadc7 --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,962 @@ +// 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 = System.getProperty('keystore_property_file') + ?: providers.gradleProperty('keystore_property_file').getOrNull() + ?: 'keystore.properties' + def keystoreProps = new Properties() + file(keystoreFile).withInputStream { keystoreProps.load(it) } + // Ant property precedence: a -D on the command line wins over (or + // supplies a missing) value from the properties file. The YubiKey + // workflow relies on this for the PIN (-Dkey.storepass=...). + def signingProp = { String name -> + System.getProperty(name) ?: 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 -Dkey.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' diff --git a/tools/build-parity/README.md b/tools/build-parity/README.md new file mode 100644 index 0000000000..67071d68f4 --- /dev/null +++ b/tools/build-parity/README.md @@ -0,0 +1,202 @@ +# Build parity tooling + +Artifacts from the Ant-to-Gradle migration (June 2026) that remain useful +whenever the build changes in ways that should not change the product. + +## compare_builds.py + +Compares two distribution trees (e.g. two `server/setup` snapshots) at the +archive-entry level: + +```bash +python3 tools/build-parity/compare_builds.py +``` + +Every file is byte-compared. Jars and zips that differ are compared entry +by entry. Differences that are pure tool metadata are classified and +reported separately: + +- manifest `Ant-Version` / `Created-By` attributes +- zip entry timestamps and ordering +- the `version.properties` timestamp comment (differs between any two + builds of the old Ant system as well) + +Anything else is a real difference and fails the run. The Gradle +migration was accepted at 490/490 archives with fully identical entry +contents against an Ant baseline built on the same machine. + +## jar-provenance.json + +The result of SHA-1 matching every vendored jar against Maven Central +(June 2026): 374 of 419 jars were byte-identical to published artifacts +and were replaced by version-catalog dependencies +(`gradle/libs.versions.toml`, placement map in +`gradle/vendored-layout.json`). Caveat learned the hard way: the Central +*search index* lacks checksum documents for some artifacts, so a +"no match" from the search API must be confirmed against +`repo1.maven.org/.../.jar.sha1` before being believed +(that is how postgresql, jsch, and snakeyaml were rescued from the +unmatched list). + +The 45 unmatched jars remain vendored in the module `lib/` directories. +Notable cases, worth auditing before ever upgrading them blindly: + +- HAPI 2.3 jars (`server/lib/hapi/` and `client/lib/`): long believed + to be Mirth-patched, but entry-level comparison proves they are + content-identical to Central's HAPI 2.3, only repackaged. Kept + vendored under the file-level SHA-exact policy. +- `mirth-vocab.jar` (generated in-house by the `generator` module) +- dcm4che 2.x (never published to Maven Central) +- `wsdl4j-1.6.2-fixed.jar` (locally patched, per its own name) +- `jtds-1.3.1` and `sqlite-jdbc-3.43.2.1`: content identical to + Central, repackaged containers only. Kept vendored. +- Genuinely locally modified (verified class-level differences): + `javaparser-1.0.8` (114 classes), `zip4j_1.3.3` (60), + `not-going-to-be-commons-ssl-0.3.18` (2). Treat these as forks. + +Resolved dependencies are pinned non-transitively so the runtime artifact +set is exactly the audited vendored set, and every resolution is +checksum-enforced by `gradle/verification-metadata.xml`. The placement +map `gradle/vendored-layout.json` is keyed by `group:artifact` and only +records which distribution directory each artifact ships in, so version +bumps never touch it. `./gradlew verifyVendoredParity` (part of +`./gradlew build`) fails if any resolved runtime artifact lacks a +placement, which would otherwise silently drop it from the staged +distribution. The launcher jars' `Class-Path` manifests are generated +from the resolved dependency versions at build time (the Ant build +hardcoded them), so version bumps cannot leave them stale. + +## The acceptance baseline + +The migration was accepted against an Ant build of commit `8c1111ba3` +(the migration commit's direct parent), built with Ant 1.10.14 on Zulu +JDK 17.0.17+10, hashed with the +[oie-release-verifier](https://github.com/mgaffigan/oie-release-verifier) +toolkit: every jar expanded, version/javadoc noise normalized, one SHA +line per file. (At acceptance time the scripts lived on branch +`feature/bash-verification-script`; that branch has since been merged +away and `main` carries them, commit `e13134ca` as of this writing.) + +The hash file itself is NOT committed (5MB of generated data); its +SHA-256 is pinned here and the file is published as a release asset +on the author's fork, linked from the migration pull request: + +``` +e54cb2ef8c30ea887fb6752fc83a4dbf9fd818de3267177d29d6d2a1eaf3f6e4 ant-baseline-hashes.txt +``` + +The hashes embed one specific javac's output, so they are not portable +across JDK builds. The reproducible procedure is the dual build, on any +machine: + +```bash +# 1. Ant baseline at the migration's parent commit +git worktree add /tmp/oie-ant 8c1111ba3 +(cd /tmp/oie-ant/server && ant -f mirth-build.xml -DdisableSigning=true -DdisableTests=true build) + +# 2. Gradle build of the migration (same JDK, same calendar day: +# version.properties embeds the build date) +./gradlew clean build dist -DdisableSigning=true + +# 3. Compare +python3 tools/build-parity/compare_builds.py /tmp/oie-ant/server/setup server/setup +``` + +Expected result: zero real differences. Known metadata-only deltas, +classified automatically by the comparator: manifest +`Ant-Version`/`Created-By` attributes, zip entry timestamps/ordering, +the `version.properties` comment line, and two directory-only entries. + +To run the verifier route itself (requires `bash` and `unzip`; +`verify.sh` also calls `sha256sum`, so on macOS install coreutils or +substitute `shasum -a 256`): + +```bash +git clone https://github.com/mgaffigan/oie-release-verifier +git -C oie-release-verifier checkout e13134ca # revision documented above +cd oie-release-verifier # required: verify.sh calls ./hash.sh etc. +./verify.sh /tmp/oie-ant/server/setup /tmp/ant-hashes.txt +./verify.sh /server/setup /tmp/gradle-hashes.txt +wc -l /tmp/ant-hashes.txt /tmp/gradle-hashes.txt # sanity: both non-empty +diff /tmp/ant-hashes.txt /tmp/gradle-hashes.txt +``` + +Pitfall, learned by hitting it: `verify.sh` must run from inside its +checkout because it invokes its sibling scripts by relative path. Run +from anywhere else it prints an error but still exits 0 and writes an +EMPTY hash file, and two empty files diff as identical, a false pass. +The script prints the output file's SHA-256 when it finishes; +`e3b0c442...` is the hash of empty input and means the run produced +nothing. Hence the `wc -l` sanity line. + +Expected: 248 changed lines and nothing else, namely the 121 archives' +`MANIFEST.MF` (the `Ant-Version` attribute the comparator also +classifies) and the 3 `version.properties` copies (they embed the full +build timestamp, so any two runs differ). Re-verified 2026-06-11 with +the `e13134ca` scripts: exactly 242 `MANIFEST.MF` + 6 +`version.properties` diff lines. + +## Signed-build check + +Signing is on by default (the committed development keystore; +`-DdisableSigning=true` skips it). The 216 jars that ship signed are +the client-lib and extension jars: + +```bash +./gradlew clean build dist +find server/setup/client-lib server/setup/extensions -name '*.jar' \ + -exec jarsigner -verify -strict {} \; +``` + +Expected: all 216 verify; `-strict` additionally warns that the +certificate chain is self-signed, which is a property of the +development keystore, not the build. The old build's output warns +identically. + +## Entry-level check of a vendored holdout + +The appendix groupings in `BUILD-MIGRATION.md` (content-identical vs +genuinely modified) are re-checkable per jar against the coordinate +recorded in its `jar-provenance.json` reason: + +```bash +curl -sLO https://repo1.maven.org/maven2////-.jar +mkdir ours theirs +(cd ours && unzip -q ../.jar); (cd theirs && unzip -q ../-.jar) +diff -r ours theirs +``` + +Expected: zero differing entries for the thirteen repackaged-identical +jars; exactly 114, 60, and 2 differing `.class` files for +`javaparser-1.0.8`, `zip4j_1.3.3`, and +`not-going-to-be-commons-ssl-0.3.18` respectively. + +## Cross-check against the published v4.6.0-rc1 release + +`compare_builds.py --ignore-signatures` was also run between the +published `oie_unix_4_6_0-rc1.tar.gz` (signed, CI-built from +`cd1110e30`) and a local unsigned Ant build of the same commit: +473 of 490 archives byte-identical in content. The remaining deltas are +all properties of the release pipeline, not the build: signature files +and JWS manifest attributes (tolerated by the flag), `module-info.class` +rewrites in 16 third-party modular jars (the signing flow's `jar umf` +step rewrites the archive and the jar tool recomputes module +attributes; the signed Gradle path runs the identical step), and the +install4j launcher files that the installer packaging adds after the +build. The signed Gradle path itself was exercised: all 216 +distribution jars sign and pass `jarsigner -verify` with the committed +development keystore. + +To reproduce: + +```bash +curl -sLO https://github.com/OpenIntegrationEngine/engine/releases/download/v4.6.0-rc1/oie_unix_4_6_0-rc1.tar.gz +shasum -a 256 oie_unix_4_6_0-rc1.tar.gz +# expect 5fd22916ebe347bb52c935df7e121eea4d4f089541dfe44c799cb4f817854c77 +# (the release also publishes an md5sums asset) +tar xzf oie_unix_4_6_0-rc1.tar.gz # extracts to oie/ +git worktree add /tmp/oie-rc1-src cd1110e30 +(cd /tmp/oie-rc1-src/server && ant -f mirth-build.xml -DdisableSigning=true -DdisableTests=true build) +python3 tools/build-parity/compare_builds.py --ignore-signatures oie /tmp/oie-rc1-src/server/setup +git worktree remove --force /tmp/oie-rc1-src # cleanup +``` diff --git a/tools/build-parity/compare_builds.py b/tools/build-parity/compare_builds.py new file mode 100644 index 0000000000..9a1a65e6fa --- /dev/null +++ b/tools/build-parity/compare_builds.py @@ -0,0 +1,149 @@ +#!/usr/bin/env python3 +"""Compare the Ant-built setup tree with the Gradle-built one. + +Archive metadata (entry order, entry timestamps, permissions) is treated +as normalization difference and only summarized. Manifests are compared +as attribute maps ignoring Ant-Version/Created-By. version.properties is +compared ignoring comment/blank lines. Everything else must be +byte-identical, including every class file and resource inside every +jar/zip. +""" +import sys, os, zipfile + +# --ignore-signatures: for comparing a signed distribution against an +# unsigned build. Signature files are skipped and the JWS attributes the +# signing flow adds to manifests are ignored (signatures embed fresh +# RFC 3161 timestamps, so they can never be byte-stable between builds). +IGNORE_SIGNATURES = False +SIG_SUFFIXES = ('.SF', '.RSA', '.DSA', '.EC') + +def is_signature(name): + return name.startswith('META-INF/') and name.upper().endswith(SIG_SUFFIXES) + +def walk(root): + out = {} + for dirpath, _, filenames in os.walk(root): + for f in filenames: + p = os.path.join(dirpath, f) + out[os.path.relpath(p, root)] = p + return out + +def is_zip(path): + return path.endswith(('.jar', '.zip', '.war')) + +def manifest_attrs(data): + # join continuation lines, parse main section only + text = data.decode('utf-8', 'replace').replace('\r\n', '\n').replace('\r', '\n') + main = text.split('\n\n')[0] + lines, out = [], {} + for line in main.split('\n'): + if line.startswith(' '): + if lines: + lines[-1] += line[1:] + elif line: + lines.append(line) + for line in lines: + if ':' in line: + k, v = line.split(':', 1) + out[k.strip()] = v.strip() + out.pop('Ant-Version', None) + out.pop('Created-By', None) + if IGNORE_SIGNATURES: + for k in ('Permissions', 'Codebase', 'Application-Name'): + out.pop(k, None) + return out + +def props_lines(data): + lines = [l for l in data.replace(b'\r\n', b'\n').split(b'\n') + if l.strip() and not l.startswith(b'#')] + if IGNORE_SIGNATURES: + # release-vs-rebuild: the build date legitimately differs + lines = [l for l in lines if not l.startswith(b'mirth.date=')] + return lines + +def entry_equal(name, a, b, report, ctx): + if a == b: + return True + base = name.rsplit('/', 1)[-1] + if base == 'MANIFEST.MF': + if manifest_attrs(a) == manifest_attrs(b): + report['manifest'] += 1 + return True + report['real'].append(f'{ctx}!{name}: manifest attributes differ:\n ant={manifest_attrs(a)}\n gradle={manifest_attrs(b)}') + return False + if base == 'version.properties': + if props_lines(a) == props_lines(b): + report['versionprops'] += 1 + return True + report['real'].append(f'{ctx}!{name}: content differs ({len(a)} vs {len(b)} bytes)') + return False + +def compare_zip(rel, pa, pb, report): + za, zb = zipfile.ZipFile(pa), zipfile.ZipFile(pb) + files_a = {n for n in za.namelist() if not n.endswith('/')} + files_b = {n for n in zb.namelist() if not n.endswith('/')} + if IGNORE_SIGNATURES: + files_a = {n for n in files_a if not is_signature(n)} + files_b = {n for n in files_b if not is_signature(n)} + dirs_a = {n for n in za.namelist() if n.endswith('/')} + dirs_b = {n for n in zb.namelist() if n.endswith('/')} + if files_a != files_b: + only_a, only_b = sorted(files_a - files_b), sorted(files_b - files_a) + report['real'].append(f'{rel}: file entry sets differ (ant-only={only_a[:8]} gradle-only={only_b[:8]})') + return + if dirs_a != dirs_b: + report['direntries'].append(f'{rel}: dir entries ant-only={sorted(dirs_a - dirs_b)[:4]} gradle-only={sorted(dirs_b - dirs_a)[:4]}') + ok = True + for n in sorted(files_a): + if not entry_equal(n, za.read(n), zb.read(n), report, rel): + ok = False + if ok: + report['zip_content_ok'] += 1 + +def main(ant_root, gradle_root): + a, b = walk(ant_root), walk(gradle_root) + report = {'real': [], 'direntries': [], 'manifest': 0, 'versionprops': 0, + 'identical': 0, 'zip_content_ok': 0} + for m in sorted(set(a) - set(b)): + report['real'].append(f'missing from gradle build: {m}') + for m in sorted(set(b) - set(a)): + report['real'].append(f'extra in gradle build: {m}') + common = sorted(set(a) & set(b)) + n_zips = sum(1 for r in common if is_zip(r)) + for rel in common: + da = open(a[rel], 'rb').read() + db = open(b[rel], 'rb').read() + if da == db: + report['identical'] += 1 + if is_zip(rel): + report['zip_content_ok'] += 1 + continue + if is_zip(rel): + compare_zip(rel, a[rel], b[rel], report) + else: + if rel.rsplit('/', 1)[-1] == 'version.properties' and props_lines(da) == props_lines(db): + report['versionprops'] += 1 + continue + report['real'].append(f'{rel}: plain file content differs') + + print(f'Common files: {len(common)} ({n_zips} jars/zips)') + print(f'Byte-identical files: {report["identical"]}') + print(f'Jars/zips with fully identical entry contents: {report["zip_content_ok"]} / {n_zips}') + print(f'Manifests differing only in Ant-Version/Created-By: {report["manifest"]}') + print(f'version.properties differing only in timestamp comment: {report["versionprops"]}') + if report['direntries']: + print(f'\nDirectory-entry-only differences ({len(report["direntries"])}):') + for x in report['direntries'][:10]: + print(f' {x}') + print(f'\nREAL differences ({len(report["real"])}):') + for x in report['real']: + print(f' {x}') + sys.exit(1 if report['real'] else 0) + +if __name__ == '__main__': + args = [a for a in sys.argv[1:] if a != '--ignore-signatures'] + IGNORE_SIGNATURES = '--ignore-signatures' in sys.argv[1:] + if len(args) != 2 or args[0].startswith('-'): + print('usage: compare_builds.py [--ignore-signatures] ') + sys.exit(2) + main(args[0], args[1]) diff --git a/tools/build-parity/jar-provenance.json b/tools/build-parity/jar-provenance.json new file mode 100644 index 0000000000..773c967d81 --- /dev/null +++ b/tools/build-parity/jar-provenance.json @@ -0,0 +1,5228 @@ +[ + { + "path": "client/lib/autocomplete-2.5.4.jar", + "sha1": "88714fa47e7fcbec8240e37f2508b13614a16fef", + "size": 145602, + "status": "none", + "reason": "content identical to Central com.fifesoft:autocomplete:2.5.4 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/bcutil-jdk18on-1.78.1.jar", + "sha1": "5353ca39fe2f148dab9ca1d637a43d0750456254", + "size": 705135, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcutil-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "client/lib/bcprov-jdk18on-1.78.1.jar", + "sha1": "39e9e45359e20998eb79c1828751f94a818d25f8", + "size": 8324412, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcprov-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "client/lib/bcpkix-jdk18on-1.78.1.jar", + "sha1": "17b3541f736df97465f87d9f5b5dfa4991b37bb3", + "size": 1125173, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcpkix-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "client/lib/commons-codec-1.21.0.jar", + "sha1": "d95f998db5f89900fe895daf6cd2cddcb2f1d64b", + "size": 402494, + "status": "exact", + "matches": [ + { + "g": "commons-codec", + "a": "commons-codec", + "v": "1.21.0" + } + ] + }, + { + "path": "client/lib/commons-beanutils-1.11.0.jar", + "sha1": "ac03ea606d13de04c2e4508227680faff151f491", + "size": 246806, + "status": "exact", + "matches": [ + { + "g": "commons-beanutils", + "a": "commons-beanutils", + "v": "1.11.0" + } + ] + }, + { + "path": "client/lib/commons-compress-1.28.0.jar", + "sha1": "e482f2c7a88dac3c497e96aa420b6a769f59c8d7", + "size": 1117221, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-compress", + "v": "1.28.0" + } + ] + }, + { + "path": "client/lib/commons-collections4-4.4.jar", + "sha1": "62ebe7544cb7164d87e0637a2a6a2bdc981395e8", + "size": 751914, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-collections4", + "v": "4.4" + } + ] + }, + { + "path": "client/lib/commons-io-2.21.0.jar", + "sha1": "52a6f68fe5afe335cde95461dd5c3412f04996f7", + "size": 585274, + "status": "exact", + "matches": [ + { + "g": "commons-io", + "a": "commons-io", + "v": "2.21.0" + } + ] + }, + { + "path": "client/lib/commons-configuration2-2.13.0.jar", + "sha1": "dc795ed544554745c52d56e0ab5f42529a7cef4e", + "size": 675321, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-configuration2", + "v": "2.13.0" + } + ] + }, + { + "path": "client/lib/commons-logging-1.3.5.jar", + "sha1": "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", + "size": 73737, + "status": "exact", + "matches": [ + { + "g": "commons-logging", + "a": "commons-logging", + "v": "1.3.5" + } + ] + }, + { + "path": "client/lib/commons-lang3-3.20.0.jar", + "sha1": "65897b3e5731220962e659e001904af3c3cbeba9", + "size": 713862, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-lang3", + "v": "3.20.0" + } + ] + }, + { + "path": "client/lib/commons-pool2-2.3.jar", + "sha1": "62a559a025fd890c30364296ece14643ba9c8c5b", + "size": 109568, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-pool2", + "v": "2.3" + } + ] + }, + { + "path": "client/lib/commons-text-1.15.0.jar", + "sha1": "9899093aa40f0199d6c39b131b8f087cdb37e399", + "size": 264873, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-text", + "v": "1.15.0" + } + ] + }, + { + "path": "client/lib/commons-vfs2-2.10.0.jar", + "sha1": "a306167fdb88152403c8b00595b1502ffacd5b76", + "size": 534044, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-vfs2", + "v": "2.10.0" + } + ] + }, + { + "path": "client/lib/guava-32.0.1-jre.jar", + "sha1": "6e5d51a72d142f2d40a57dfb897188b36a95b489", + "size": 3037368, + "status": "exact", + "matches": [ + { + "g": "com.google.guava", + "a": "guava", + "v": "32.0.1-jre" + } + ] + }, + { + "path": "client/lib/hapi-structures-v22-2.3.jar", + "sha1": "fa5132c6c657a7f1eaa1497111d4e36b32c6cc81", + "size": 407491, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v22:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v23-2.3.jar", + "sha1": "7610cbc40f2ce4a1fbdd831979ef42dd2088cf70", + "size": 1997093, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v23:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-base-2.3.jar", + "sha1": "90e1b36af965c950d70de0a657ff224a8086b28e", + "size": 663899, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-base:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v21-2.3.jar", + "sha1": "d48417a1908e4e4694dc3d3f6450aefb8bb80717", + "size": 174988, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v21:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v231-2.3.jar", + "sha1": "aeb04355e85cbd55d0612ab78aa511f7cb2b4165", + "size": 1270056, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v231:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v251-2.3.jar", + "sha1": "1f5addbadb0930471d976178a22995f9f7f673e2", + "size": 1883758, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v251:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v25-2.3.jar", + "sha1": "d2f4791e7139d259e107d384d1cb91c81b221868", + "size": 1890603, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v25:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v24-2.3.jar", + "sha1": "f9689d6a75a9248fb528f3b0d8b17e07692213e1", + "size": 1461319, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v24:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v27-2.3.jar", + "sha1": "3f7d410710a30ec72a5bf02fed897630d18347ae", + "size": 2219604, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v27", + "v": "2.3" + } + ] + }, + { + "path": "client/lib/hapi-structures-v26-2.3.jar", + "sha1": "5ceccab8f5c4d62eec7fee84e184f8e133615a94", + "size": 2083091, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v26:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/hapi-structures-v28-2.3.jar", + "sha1": "3afe23ad8d7345bd63d4ba2a2814e291930c3621", + "size": 2341924, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v28", + "v": "2.3" + } + ] + }, + { + "path": "client/lib/hapi-structures-v281-2.3.jar", + "sha1": "254204a380b95bf842c8f3882b49621b81a4a97c", + "size": 2402047, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v281", + "v": "2.3" + } + ] + }, + { + "path": "client/lib/httpclient-4.5.13.jar", + "sha1": "e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada", + "size": 780321, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpclient", + "v": "4.5.13" + } + ] + }, + { + "path": "client/lib/hk2-utils-2.4.0-b31.jar", + "sha1": "2c5cb698cfec8dde859c3db854178d03bf7248a6", + "size": 101088, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-utils", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "client/lib/hk2-api-2.4.0-b31.jar", + "sha1": "c4b5f6c426f8e412e606332b93b7cf745a9a12c5", + "size": 173037, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-api", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "client/lib/hk2-locator-2.4.0-b31.jar", + "sha1": "436d6e1ad2b0a3aee939c6e05983b007b3578142", + "size": 179705, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-locator", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "client/lib/istack-commons-runtime-3.0.6.jar", + "sha1": "ef4d2cd80d5b79b8dbe689fb2d7fbfb61cf494f4", + "size": 25469, + "status": "none", + "reason": "version 3.0.6 never published to Central (artifact exists; recent versions: 4.1.0, 4.1.0-M1, 4.1.1, 4.1.2, 4.2.0)" + }, + { + "path": "client/lib/jackson-annotations-2.14.3.jar", + "sha1": "b49701acb02b8e95ae1967821cfbafc220cf5795", + "size": 76636, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-annotations", + "v": "2.14.3" + } + ] + }, + { + "path": "client/lib/httpcore-4.4.13.jar", + "sha1": "853b96d3afbb7bf8cc303fe27ee96836a10c1834", + "size": 328593, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpcore", + "v": "4.4.13" + } + ] + }, + { + "path": "client/lib/httpmime-4.5.13.jar", + "sha1": "efc110bad4a0d45cda7858e6beee1d8a8313da5a", + "size": 41790, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpmime", + "v": "4.5.13" + } + ] + }, + { + "path": "client/lib/jai_imageio.jar", + "sha1": "d6e1cff914c758b42635331f8884714e363886f1", + "size": 927714, + "status": "none", + "reason": "no version published to Maven Central under the same artifact name matches these bytes; java.net-era JAI ImageIO build, kept vendored under its stable launcher filename" + }, + { + "path": "client/lib/jackson-core-2.14.3.jar", + "sha1": "4fa101f81504ed6811bf1823270adb51a9b45ff3", + "size": 473081, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-core", + "v": "2.14.3" + } + ] + }, + { + "path": "client/lib/jakarta.activation-1.2.1.jar", + "sha1": "8013606426a73d8ba6b568370877251e91a38b89", + "size": 65690, + "status": "exact", + "matches": [ + { + "g": "com.sun.activation", + "a": "jakarta.activation", + "v": "1.2.1" + } + ] + }, + { + "path": "client/lib/jackson-databind-2.14.3.jar", + "sha1": "ba0373b04bf0f03b0cd268cd2e5e8444aaaf9208", + "size": 1617187, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-databind", + "v": "2.14.3" + } + ] + }, + { + "path": "client/lib/javaparser-1.0.8.jar", + "sha1": "da8eb7fd91ee8330c03fab6fa497c45d25d7fc59", + "size": 256349, + "status": "none", + "reason": "locally modified: 114 class files differ vs Central com.google.code.javaparser:javaparser:1.0.8 (verified entry by entry). Must stay vendored; treat as a fork when considering upgrades." + }, + { + "path": "client/lib/jakarta.mail-1.6.7.jar", + "sha1": "319df0e9d536c1a01acdfe49b6e82b97d2393073", + "size": 676654, + "status": "exact", + "matches": [ + { + "g": "com.sun.mail", + "a": "jakarta.mail", + "v": "1.6.7" + } + ] + }, + { + "path": "client/lib/java-semver-0.10.2.jar", + "sha1": "0502f9bd3596181449222c16c6ad7108e320dce3", + "size": 52003, + "status": "exact", + "matches": [ + { + "g": "com.github.zafarkhaja", + "a": "java-semver", + "v": "0.10.2" + } + ] + }, + { + "path": "client/lib/javassist-3.26.0-GA.jar", + "sha1": "bb2890849968d8d8311ffba8c37b0ce16ce284dc", + "size": 782535, + "status": "exact", + "matches": [ + { + "g": "org.javassist", + "a": "javassist", + "v": "3.26.0-GA" + } + ] + }, + { + "path": "client/lib/javax.annotation-api-1.3.2.jar", + "sha1": "934c04d3cfef185a8008e7bf34331b79730a9d43", + "size": 26586, + "status": "exact", + "matches": [ + { + "g": "one.gfw", + "a": "javax.annotation-api", + "v": "1.3.2" + }, + { + "g": "javax.annotation", + "a": "javax.annotation-api", + "v": "1.3.2" + } + ] + }, + { + "path": "client/lib/javax.inject-2.4.0-b31.jar", + "sha1": "04bb71bbdae1064675e36d057bd2c95a00e2e84b", + "size": 5951, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "javax.inject", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "client/lib/javax.ws.rs-api-2.0.1.jar", + "sha1": "104e9c2b5583cfcfeac0402316221648d6d8ea6b", + "size": 115534, + "status": "exact", + "matches": [ + { + "g": "javax.ws.rs", + "a": "javax.ws.rs-api", + "v": "2.0.1" + } + ] + }, + { + "path": "client/lib/javax.activation-api-1.2.0.jar", + "sha1": "85262acf3ca9816f9537ca47d5adeabaead7cb16", + "size": 56674, + "status": "exact", + "matches": [ + { + "g": "one.gfw", + "a": "javax.activation-api", + "v": "1.2.0" + }, + { + "g": "javax.activation", + "a": "javax.activation-api", + "v": "1.2.0" + } + ] + }, + { + "path": "client/lib/jaxb-api-2.4.0-b180725.0427.jar", + "sha1": "7400ad346870308bcc46bb60f3c553af3e331b4d", + "size": 128036, + "status": "exact", + "matches": [ + { + "g": "javax.xml.bind", + "a": "jaxb-api", + "v": "2.4.0-b180725.0427" + } + ] + }, + { + "path": "client/lib/jcifs-ng-2.1.10.jar", + "sha1": "94b4c0b173540ae98c379ea278713665fd8ab3eb", + "size": 822626, + "status": "exact", + "matches": [ + { + "g": "eu.agno3.jcifs", + "a": "jcifs-ng", + "v": "2.1.10" + } + ] + }, + { + "path": "client/lib/jaxb-runtime-2.4.0-b180725.0644.jar", + "sha1": "a98b5ac2580f5870049c008021c77e0b918d04ee", + "size": 1093480, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jaxb", + "a": "jaxb-runtime", + "v": "2.4.0-b180725.0644" + } + ] + }, + { + "path": "client/lib/jersey-client-2.22.1.jar", + "sha1": "e39297ef90f4b9bdf0a61b6fa73ae275c1b6e8f1", + "size": 163417, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-client", + "v": "2.22.1" + } + ] + }, + { + "path": "client/lib/jersey-common-2.22.1.jar", + "sha1": "b5811d8385766f35d10d204952f3d5b57ee2fb60", + "size": 696004, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-common", + "v": "2.22.1" + } + ] + }, + { + "path": "client/lib/jersey-proxy-client-2.22.1.jar", + "sha1": "20163533fe4e4cb7c3116388640d85d31625b3b2", + "size": 9603, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.ext", + "a": "jersey-proxy-client", + "v": "2.22.1" + } + ] + }, + { + "path": "client/lib/jersey-guava-2.22.1.jar", + "sha1": "2b79eb893818539370899c24893fac9b2fdc4dbd", + "size": 971278, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.bundles.repackaged", + "a": "jersey-guava", + "v": "2.22.1" + } + ] + }, + { + "path": "client/lib/jersey-media-multipart-2.22.1.jar", + "sha1": "c68e535f2395fa961a0903dac0ae32641768d4b6", + "size": 68019, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.media", + "a": "jersey-media-multipart", + "v": "2.22.1" + } + ] + }, + { + "path": "client/lib/jetty-util-9.4.57.v20241219.jar", + "sha1": "7bf7ea75644ac064199e1e32c66ccd312239f2dc", + "size": 588962, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-util", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "client/lib/libphonenumber-8.12.50.jar", + "sha1": "8a772e3d56aed23c4f2c2750606b0be87bc0ded4", + "size": 365129, + "status": "exact", + "matches": [ + { + "g": "com.googlecode.libphonenumber", + "a": "libphonenumber", + "v": "8.12.50" + } + ] + }, + { + "path": "client/lib/language_support.jar", + "sha1": "69a515c27e6a1cffbeb69d7aa4c84e4f8501effc", + "size": 1084840, + "status": "none", + "reason": "no artifact of this name on Maven Central; NetBeans-era library, kept vendored under its stable launcher filename" + }, + { + "path": "client/lib/joda-time-2.9.9.jar", + "sha1": "f7b520c458572890807d143670c9b24f4de90897", + "size": 634048, + "status": "exact", + "matches": [ + { + "g": "joda-time", + "a": "joda-time", + "v": "2.9.9" + } + ] + }, + { + "path": "client/lib/log4j-core-2.25.3.jar", + "sha1": "dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea", + "size": 2018402, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-core", + "v": "2.25.3" + } + ] + }, + { + "path": "client/lib/log4j-api-2.25.3.jar", + "sha1": "fb385330d89c2d61058ef649403f214633569205", + "size": 350610, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-api", + "v": "2.25.3" + } + ] + }, + { + "path": "client/lib/log4j-1.2-api-2.25.3.jar", + "sha1": "a7e550e638a5e534fd944616c5ae665a67e9501e", + "size": 359213, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-1.2-api", + "v": "2.25.3" + } + ] + }, + { + "path": "client/lib/looks-2.3.1.jar", + "sha1": "9bbae3f200a69bce3e237d3fbbfa47933071c6ba", + "size": 408024, + "status": "none", + "reason": "version 2.3.1 never published to Central (artifact exists; recent versions: 2.1.2, 2.1.4, 2.2.0, 2.2.1, 2.2.2)" + }, + { + "path": "client/lib/miglayout-core-4.2.jar", + "sha1": "70f2bfa2a077ee1632cc8229deffa1d942825c78", + "size": 66663, + "status": "exact", + "matches": [ + { + "g": "com.miglayout", + "a": "miglayout-core", + "v": "4.2" + } + ] + }, + { + "path": "client/lib/miglayout-swing-4.2.jar", + "sha1": "ca85067488e79a2078ba4eb8e2617653e9172388", + "size": 14580, + "status": "exact", + "matches": [ + { + "g": "com.miglayout", + "a": "miglayout-swing", + "v": "4.2" + } + ] + }, + { + "path": "client/lib/mimepull-1.9.7.jar", + "sha1": "3085dfe507b6ce43c1fcc60f228d65a7731b8e7d", + "size": 63985, + "status": "exact", + "matches": [ + { + "g": "org.jvnet.mimepull", + "a": "mimepull", + "v": "1.9.7" + } + ] + }, + { + "path": "client/lib/openjfx.jar", + "sha1": "aa463c16358168d451731e5818b1adcacfa634c0", + "size": 9342744, + "status": "none", + "reason": "no version published to Maven Central under the same artifact name matches these bytes (all candidate fingerprints checked); era-specific repackaged JavaFX, kept vendored under its stable launcher filename" + }, + { + "path": "client/lib/regions-2.15.28.jar", + "sha1": "b25e279a4fdf0b5dab31627201b68dc6b8d32eb5", + "size": 434672, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "regions", + "v": "2.15.28" + } + ] + }, + { + "path": "client/lib/quartz-2.3.2.jar", + "sha1": "18a6d6b5a40b77bd060b34cb9f2acadc4bae7c8a", + "size": 693050, + "status": "exact", + "matches": [ + { + "g": "org.quartz-scheduler", + "a": "quartz", + "v": "2.3.2" + } + ] + }, + { + "path": "client/lib/reflections-0.9.10.jar", + "sha1": "c7f4ea230aedc757ca1499ebcfb2953c81cf8b67", + "size": 129763, + "status": "exact", + "matches": [ + { + "g": "org.reflections", + "a": "reflections", + "v": "0.9.10" + } + ] + }, + { + "path": "client/lib/rhino-1.7.13.jar", + "sha1": "e6b2e12dc79fbdc58d8bf62a583705a551ec37d6", + "size": 1315838, + "status": "exact", + "matches": [ + { + "g": "org.mozilla", + "a": "rhino", + "v": "1.7.13" + } + ] + }, + { + "path": "client/lib/staxon-1.3.jar", + "sha1": "9cec6f1c1a05eeebb0b83b3e909fd4b496ddde44", + "size": 150272, + "status": "exact", + "matches": [ + { + "g": "de.odysseus.staxon", + "a": "staxon", + "v": "1.3" + } + ] + }, + { + "path": "client/lib/slf4j-log4j12-1.7.30.jar", + "sha1": "c21f55139d8141d2231214fb1feaf50a1edca95e", + "size": 12211, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-log4j12", + "v": "1.7.30" + } + ] + }, + { + "path": "client/lib/rsyntaxtextarea-2.5.6.jar", + "sha1": "4a2678e4369165849ca6315aa10363b31a2bea75", + "size": 1037784, + "status": "none", + "reason": "content identical to Central com.fifesoft:rsyntaxtextarea:2.5.6 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "client/lib/slf4j-api-1.7.30.jar", + "sha1": "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", + "size": 41472, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-api", + "v": "1.7.30" + } + ] + }, + { + "path": "client/lib/velocity-engine-core-2.3.jar", + "sha1": "e2133b723d0e42be74880d34de6bf6538ea7f915", + "size": 531308, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity", + "a": "velocity-engine-core", + "v": "2.3" + } + ] + }, + { + "path": "client/lib/swagger-annotations-2.0.10.jar", + "sha1": "85428dac7402fdca267219b76af644c21246b6bd", + "size": 34730, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-annotations", + "v": "2.0.10" + } + ] + }, + { + "path": "client/lib/swingx-core-1.6.2.jar", + "sha1": "4475f362eafad890321631daa3d56f0f55e04edf", + "size": 1447793, + "status": "exact", + "matches": [ + { + "g": "org.swinglabs", + "a": "swingx-core", + "v": "1.6.2-2" + }, + { + "g": "org.swinglabs", + "a": "swingx-core", + "v": "1.6.2" + } + ] + }, + { + "path": "client/lib/utils-2.15.28.jar", + "sha1": "bc047a4cd8b6ce45d191a2818b41782c9034c80e", + "size": 108518, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "utils", + "v": "2.15.28" + } + ] + }, + { + "path": "client/lib/xpp3-1.1.4c.jar", + "sha1": "9b988ea84b9e4e9f1874e390ce099b8ac12cfff5", + "size": 120069, + "status": "exact", + "matches": [ + { + "g": "xpp3", + "a": "xpp3", + "v": "1.1.4c" + } + ] + }, + { + "path": "client/lib/velocity-tools-generic-3.1.jar", + "sha1": "07aaa49086a64cd9dab967a8437cc03abbfad655", + "size": 216933, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity.tools", + "a": "velocity-tools-generic", + "v": "3.1" + } + ] + }, + { + "path": "client/lib/wizard.jar", + "sha1": "53dc1dea20f962804d29b95fcd3dccdb172047d0", + "size": 222624, + "status": "none", + "reason": "no version published to Maven Central under the same artifact name matches these bytes (40 candidates checked); NetBeans-era wizard library, kept vendored under its stable launcher filename" + }, + { + "path": "client/lib/xstream-1.4.20.jar", + "sha1": "0e2315b8b2e95e9f21697833c8e56cdd9c98a5ee", + "size": 644649, + "status": "exact", + "matches": [ + { + "g": "com.thoughtworks.xstream", + "a": "xstream", + "v": "1.4.20" + } + ] + }, + { + "path": "command/lib/bcutil-jdk18on-1.78.1.jar", + "sha1": "5353ca39fe2f148dab9ca1d637a43d0750456254", + "size": 705135, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcutil-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "client/lib/zip4j_1.3.3.jar", + "sha1": "7791ee6d23da90c010fb9993dde3f124ba0f750c", + "size": 123998, + "status": "none", + "reason": "locally modified: 60 class files differ vs Central net.lingala.zip4j:zip4j:1.3.3 (verified entry by entry). Must stay vendored; treat as a fork when considering upgrades." + }, + { + "path": "command/lib/bcprov-jdk18on-1.78.1.jar", + "sha1": "39e9e45359e20998eb79c1828751f94a818d25f8", + "size": 8324412, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcprov-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "command/lib/bcpkix-jdk18on-1.78.1.jar", + "sha1": "17b3541f736df97465f87d9f5b5dfa4991b37bb3", + "size": 1125173, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcpkix-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "command/lib/commons-beanutils-1.11.0.jar", + "sha1": "ac03ea606d13de04c2e4508227680faff151f491", + "size": 246806, + "status": "exact", + "matches": [ + { + "g": "commons-beanutils", + "a": "commons-beanutils", + "v": "1.11.0" + } + ] + }, + { + "path": "command/lib/commons-cli-1.2.jar", + "sha1": "2bf96b7aa8b611c177d329452af1dc933e14501c", + "size": 41123, + "status": "exact", + "matches": [ + { + "g": "commons-cli", + "a": "commons-cli", + "v": "1.2" + } + ] + }, + { + "path": "command/lib/commons-codec-1.21.0.jar", + "sha1": "d95f998db5f89900fe895daf6cd2cddcb2f1d64b", + "size": 402494, + "status": "exact", + "matches": [ + { + "g": "commons-codec", + "a": "commons-codec", + "v": "1.21.0" + } + ] + }, + { + "path": "command/lib/commons-collections4-4.4.jar", + "sha1": "62ebe7544cb7164d87e0637a2a6a2bdc981395e8", + "size": 751914, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-collections4", + "v": "4.4" + } + ] + }, + { + "path": "command/lib/commons-io-2.21.0.jar", + "sha1": "52a6f68fe5afe335cde95461dd5c3412f04996f7", + "size": 585274, + "status": "exact", + "matches": [ + { + "g": "commons-io", + "a": "commons-io", + "v": "2.21.0" + } + ] + }, + { + "path": "command/lib/commons-configuration2-2.13.0.jar", + "sha1": "dc795ed544554745c52d56e0ab5f42529a7cef4e", + "size": 675321, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-configuration2", + "v": "2.13.0" + } + ] + }, + { + "path": "command/lib/commons-lang3-3.20.0.jar", + "sha1": "65897b3e5731220962e659e001904af3c3cbeba9", + "size": 713862, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-lang3", + "v": "3.20.0" + } + ] + }, + { + "path": "command/lib/commons-logging-1.3.5.jar", + "sha1": "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", + "size": 73737, + "status": "exact", + "matches": [ + { + "g": "commons-logging", + "a": "commons-logging", + "v": "1.3.5" + } + ] + }, + { + "path": "command/lib/commons-pool2-2.3.jar", + "sha1": "62a559a025fd890c30364296ece14643ba9c8c5b", + "size": 109568, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-pool2", + "v": "2.3" + } + ] + }, + { + "path": "command/lib/commons-text-1.15.0.jar", + "sha1": "9899093aa40f0199d6c39b131b8f087cdb37e399", + "size": 264873, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-text", + "v": "1.15.0" + } + ] + }, + { + "path": "command/lib/commons-vfs2-2.10.0.jar", + "sha1": "a306167fdb88152403c8b00595b1502ffacd5b76", + "size": 534044, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-vfs2", + "v": "2.10.0" + } + ] + }, + { + "path": "command/lib/guava-32.0.1-jre.jar", + "sha1": "6e5d51a72d142f2d40a57dfb897188b36a95b489", + "size": 3037368, + "status": "exact", + "matches": [ + { + "g": "com.google.guava", + "a": "guava", + "v": "32.0.1-jre" + } + ] + }, + { + "path": "command/lib/hk2-utils-2.4.0-b31.jar", + "sha1": "2c5cb698cfec8dde859c3db854178d03bf7248a6", + "size": 101088, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-utils", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "command/lib/hk2-locator-2.4.0-b31.jar", + "sha1": "436d6e1ad2b0a3aee939c6e05983b007b3578142", + "size": 179705, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-locator", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "command/lib/hk2-api-2.4.0-b31.jar", + "sha1": "c4b5f6c426f8e412e606332b93b7cf745a9a12c5", + "size": 173037, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-api", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "command/lib/httpclient-4.5.13.jar", + "sha1": "e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada", + "size": 780321, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpclient", + "v": "4.5.13" + } + ] + }, + { + "path": "command/lib/jackson-core-2.14.3.jar", + "sha1": "4fa101f81504ed6811bf1823270adb51a9b45ff3", + "size": 473081, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-core", + "v": "2.14.3" + } + ] + }, + { + "path": "command/lib/httpmime-4.5.13.jar", + "sha1": "efc110bad4a0d45cda7858e6beee1d8a8313da5a", + "size": 41790, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpmime", + "v": "4.5.13" + } + ] + }, + { + "path": "command/lib/jackson-annotations-2.14.3.jar", + "sha1": "b49701acb02b8e95ae1967821cfbafc220cf5795", + "size": 76636, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-annotations", + "v": "2.14.3" + } + ] + }, + { + "path": "command/lib/httpcore-4.4.13.jar", + "sha1": "853b96d3afbb7bf8cc303fe27ee96836a10c1834", + "size": 328593, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpcore", + "v": "4.4.13" + } + ] + }, + { + "path": "command/lib/jackson-databind-2.14.3.jar", + "sha1": "ba0373b04bf0f03b0cd268cd2e5e8444aaaf9208", + "size": 1617187, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-databind", + "v": "2.14.3" + } + ] + }, + { + "path": "command/lib/jakarta.activation-1.2.1.jar", + "sha1": "8013606426a73d8ba6b568370877251e91a38b89", + "size": 65690, + "status": "exact", + "matches": [ + { + "g": "com.sun.activation", + "a": "jakarta.activation", + "v": "1.2.1" + } + ] + }, + { + "path": "command/lib/javassist-3.26.0-GA.jar", + "sha1": "bb2890849968d8d8311ffba8c37b0ce16ce284dc", + "size": 782535, + "status": "exact", + "matches": [ + { + "g": "org.javassist", + "a": "javassist", + "v": "3.26.0-GA" + } + ] + }, + { + "path": "command/lib/javax.activation-api-1.2.0.jar", + "sha1": "85262acf3ca9816f9537ca47d5adeabaead7cb16", + "size": 56674, + "status": "exact", + "matches": [ + { + "g": "one.gfw", + "a": "javax.activation-api", + "v": "1.2.0" + }, + { + "g": "javax.activation", + "a": "javax.activation-api", + "v": "1.2.0" + } + ] + }, + { + "path": "command/lib/javax.annotation-api-1.3.jar", + "sha1": "67747496d8b5c1f300ed3cde4ba69d6f453ba984", + "size": 26430, + "status": "exact", + "matches": [ + { + "g": "javax.annotation", + "a": "javax.annotation-api", + "v": "1.3" + } + ] + }, + { + "path": "command/lib/javax.inject-2.4.0-b31.jar", + "sha1": "04bb71bbdae1064675e36d057bd2c95a00e2e84b", + "size": 5951, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "javax.inject", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "command/lib/javax.ws.rs-api-2.0.1.jar", + "sha1": "104e9c2b5583cfcfeac0402316221648d6d8ea6b", + "size": 115534, + "status": "exact", + "matches": [ + { + "g": "javax.ws.rs", + "a": "javax.ws.rs-api", + "v": "2.0.1" + } + ] + }, + { + "path": "command/lib/jaxb-api-2.4.0-b180725.0427.jar", + "sha1": "7400ad346870308bcc46bb60f3c553af3e331b4d", + "size": 128036, + "status": "exact", + "matches": [ + { + "g": "javax.xml.bind", + "a": "jaxb-api", + "v": "2.4.0-b180725.0427" + } + ] + }, + { + "path": "command/lib/jersey-client-2.22.1.jar", + "sha1": "e39297ef90f4b9bdf0a61b6fa73ae275c1b6e8f1", + "size": 163417, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-client", + "v": "2.22.1" + } + ] + }, + { + "path": "command/lib/jersey-guava-2.22.1.jar", + "sha1": "2b79eb893818539370899c24893fac9b2fdc4dbd", + "size": 971278, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.bundles.repackaged", + "a": "jersey-guava", + "v": "2.22.1" + } + ] + }, + { + "path": "command/lib/jaxb-runtime-2.4.0-b180725.0644.jar", + "sha1": "a98b5ac2580f5870049c008021c77e0b918d04ee", + "size": 1093480, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jaxb", + "a": "jaxb-runtime", + "v": "2.4.0-b180725.0644" + } + ] + }, + { + "path": "command/lib/jersey-common-2.22.1.jar", + "sha1": "b5811d8385766f35d10d204952f3d5b57ee2fb60", + "size": 696004, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-common", + "v": "2.22.1" + } + ] + }, + { + "path": "command/lib/log4j-api-2.25.3.jar", + "sha1": "fb385330d89c2d61058ef649403f214633569205", + "size": 350610, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-api", + "v": "2.25.3" + } + ] + }, + { + "path": "command/lib/jetty-util-9.4.57.v20241219.jar", + "sha1": "7bf7ea75644ac064199e1e32c66ccd312239f2dc", + "size": 588962, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-util", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "command/lib/jersey-proxy-client-2.22.1.jar", + "sha1": "20163533fe4e4cb7c3116388640d85d31625b3b2", + "size": 9603, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.ext", + "a": "jersey-proxy-client", + "v": "2.22.1" + } + ] + }, + { + "path": "command/lib/jersey-media-multipart-2.22.1.jar", + "sha1": "c68e535f2395fa961a0903dac0ae32641768d4b6", + "size": 68019, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.media", + "a": "jersey-media-multipart", + "v": "2.22.1" + } + ] + }, + { + "path": "command/lib/log4j-core-2.25.3.jar", + "sha1": "dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea", + "size": 2018402, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-core", + "v": "2.25.3" + } + ] + }, + { + "path": "command/lib/mimepull-1.9.7.jar", + "sha1": "3085dfe507b6ce43c1fcc60f228d65a7731b8e7d", + "size": 63985, + "status": "exact", + "matches": [ + { + "g": "org.jvnet.mimepull", + "a": "mimepull", + "v": "1.9.7" + } + ] + }, + { + "path": "command/lib/reflections-0.9.10.jar", + "sha1": "c7f4ea230aedc757ca1499ebcfb2953c81cf8b67", + "size": 129763, + "status": "exact", + "matches": [ + { + "g": "org.reflections", + "a": "reflections", + "v": "0.9.10" + } + ] + }, + { + "path": "command/lib/rhino-1.7.13.jar", + "sha1": "e6b2e12dc79fbdc58d8bf62a583705a551ec37d6", + "size": 1315838, + "status": "exact", + "matches": [ + { + "g": "org.mozilla", + "a": "rhino", + "v": "1.7.13" + } + ] + }, + { + "path": "command/lib/slf4j-api-1.7.30.jar", + "sha1": "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", + "size": 41472, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-api", + "v": "1.7.30" + } + ] + }, + { + "path": "command/lib/slf4j-log4j12-1.7.30.jar", + "sha1": "c21f55139d8141d2231214fb1feaf50a1edca95e", + "size": 12211, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-log4j12", + "v": "1.7.30" + } + ] + }, + { + "path": "command/lib/swagger-annotations-2.0.10.jar", + "sha1": "85428dac7402fdca267219b76af644c21246b6bd", + "size": 34730, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-annotations", + "v": "2.0.10" + } + ] + }, + { + "path": "command/lib/staxon-1.3.jar", + "sha1": "9cec6f1c1a05eeebb0b83b3e909fd4b496ddde44", + "size": 150272, + "status": "exact", + "matches": [ + { + "g": "de.odysseus.staxon", + "a": "staxon", + "v": "1.3" + } + ] + }, + { + "path": "command/lib/velocity-engine-core-2.3.jar", + "sha1": "e2133b723d0e42be74880d34de6bf6538ea7f915", + "size": 531308, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity", + "a": "velocity-engine-core", + "v": "2.3" + } + ] + }, + { + "path": "command/lib/xstream-1.4.20.jar", + "sha1": "0e2315b8b2e95e9f21697833c8e56cdd9c98a5ee", + "size": 644649, + "status": "exact", + "matches": [ + { + "g": "com.thoughtworks.xstream", + "a": "xstream", + "v": "1.4.20" + } + ] + }, + { + "path": "command/lib/velocity-tools-generic-3.1.jar", + "sha1": "07aaa49086a64cd9dab967a8437cc03abbfad655", + "size": 216933, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity.tools", + "a": "velocity-tools-generic", + "v": "3.1" + } + ] + }, + { + "path": "command/lib/xpp3-1.1.4c.jar", + "sha1": "9b988ea84b9e4e9f1874e390ce099b8ac12cfff5", + "size": 120069, + "status": "exact", + "matches": [ + { + "g": "xpp3", + "a": "xpp3", + "v": "1.1.4c" + } + ] + }, + { + "path": "donkey/lib/commons/commons-codec-1.21.0.jar", + "sha1": "d95f998db5f89900fe895daf6cd2cddcb2f1d64b", + "size": 402494, + "status": "exact", + "matches": [ + { + "g": "commons-codec", + "a": "commons-codec", + "v": "1.21.0" + } + ] + }, + { + "path": "donkey/lib/HikariCP-2.5.1.jar", + "sha1": "b896b711e2d98fedf403de590559a123b5fbf1a6", + "size": 136363, + "status": "exact", + "matches": [ + { + "g": "com.zaxxer", + "a": "HikariCP", + "v": "2.5.1" + } + ] + }, + { + "path": "donkey/lib/commons/commons-beanutils-1.11.0.jar", + "sha1": "ac03ea606d13de04c2e4508227680faff151f491", + "size": 246806, + "status": "exact", + "matches": [ + { + "g": "commons-beanutils", + "a": "commons-beanutils", + "v": "1.11.0" + } + ] + }, + { + "path": "command/testlib/junit-4.8.1.jar", + "sha1": "f2975548f836416306ef1dee748d956f04733915", + "size": 237047, + "status": "exact", + "matches": [ + { + "g": "junit", + "a": "junit", + "v": "4.8.1" + } + ] + }, + { + "path": "donkey/lib/commons/commons-collections4-4.4.jar", + "sha1": "62ebe7544cb7164d87e0637a2a6a2bdc981395e8", + "size": 751914, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-collections4", + "v": "4.4" + } + ] + }, + { + "path": "donkey/lib/commons/commons-io-2.21.0.jar", + "sha1": "52a6f68fe5afe335cde95461dd5c3412f04996f7", + "size": 585274, + "status": "exact", + "matches": [ + { + "g": "commons-io", + "a": "commons-io", + "v": "2.21.0" + } + ] + }, + { + "path": "donkey/lib/commons/commons-dbutils-1.7.jar", + "sha1": "a2d6e515aa87e5d38f6b3003e70b13c1b1f19ca0", + "size": 97075, + "status": "exact", + "matches": [ + { + "g": "commons-dbutils", + "a": "commons-dbutils", + "v": "1.7" + } + ] + }, + { + "path": "donkey/lib/commons/commons-dbcp2-2.0.1.jar", + "sha1": "dc887691eab129c5728e26b095751fcadd36719d", + "size": 167962, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-dbcp2", + "v": "2.0.1" + } + ] + }, + { + "path": "donkey/lib/commons/commons-lang3-3.20.0.jar", + "sha1": "65897b3e5731220962e659e001904af3c3cbeba9", + "size": 713862, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-lang3", + "v": "3.20.0" + } + ] + }, + { + "path": "donkey/lib/commons/commons-logging-1.3.5.jar", + "sha1": "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", + "size": 73737, + "status": "exact", + "matches": [ + { + "g": "commons-logging", + "a": "commons-logging", + "v": "1.3.5" + } + ] + }, + { + "path": "donkey/lib/commons/commons-math3-3.0.jar", + "sha1": "5f8d1d720333aa9a7dee1c949ea70d9ed7da6106", + "size": 1285617, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-math3", + "v": "3.0" + } + ] + }, + { + "path": "donkey/lib/commons/commons-pool2-2.3.jar", + "sha1": "62a559a025fd890c30364296ece14643ba9c8c5b", + "size": 109568, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-pool2", + "v": "2.3" + } + ] + }, + { + "path": "donkey/lib/commons/commons-text-1.15.0.jar", + "sha1": "9899093aa40f0199d6c39b131b8f087cdb37e399", + "size": 264873, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-text", + "v": "1.15.0" + } + ] + }, + { + "path": "donkey/lib/database/derby-10.10.2.0.jar", + "sha1": "47eba6736561c377f2132f5e09e2fe8084d899a9", + "size": 2838580, + "status": "exact", + "matches": [ + { + "g": "org.apache.derby", + "a": "derby", + "v": "10.10.2.0" + } + ] + }, + { + "path": "donkey/lib/database/jtds-1.3.1.jar", + "sha1": "1fc4d17efa80dc375767b0c1006584175212e9dc", + "size": 317816, + "status": "none", + "reason": "content identical to Central net.sourceforge.jtds:jtds:1.3.1 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "donkey/lib/database/mssql-jdbc-8.4.1.jre8.jar", + "sha1": "b5ffea221217c051429a6d2af974ee7341765424", + "size": 1300915, + "status": "exact", + "matches": [ + { + "g": "com.microsoft.sqlserver", + "a": "mssql-jdbc", + "v": "8.4.1.jre8" + } + ] + }, + { + "path": "donkey/lib/database/mysql-connector-j-8.4.0.jar", + "sha1": "b1bc0f47bcad26ad5f9bceefb63fcb920d868fca", + "size": 2533399, + "status": "exact", + "matches": [ + { + "g": "com.mysql", + "a": "mysql-connector-j", + "v": "8.4.0" + } + ] + }, + { + "path": "donkey/lib/database/ojdbc8-12.2.0.1.jar", + "sha1": "60f439fd01536508df32658d0a416c49ac6f07fb", + "size": 4036257, + "status": "exact", + "matches": [ + { + "g": "com.oracle.database.jdbc", + "a": "ojdbc8", + "v": "12.2.0.1" + } + ] + }, + { + "path": "donkey/lib/database/postgresql-42.7.8.jar", + "sha1": "81b840fbfe0a6c0b7aa14c6bd4856108d36ed780", + "size": 1116727, + "status": "exact", + "matches": [ + { + "g": "org.postgresql", + "a": "postgresql", + "v": "42.7.8" + } + ], + "note": "verified directly against repo1.maven.org .jar.sha1; absent from the Central search checksum index" + }, + { + "path": "donkey/lib/guava/checker-qual-2.10.0.jar", + "sha1": "5786699a0cb71f9dc32e6cca1d665eef07a0882f", + "size": 201216, + "status": "exact", + "matches": [ + { + "g": "org.checkerframework", + "a": "checker-qual", + "v": "2.10.0" + } + ] + }, + { + "path": "donkey/lib/guava/error_prone_annotations-2.3.4.jar", + "sha1": "dac170e4594de319655ffb62f41cbd6dbb5e601e", + "size": 13879, + "status": "exact", + "matches": [ + { + "g": "com.google.errorprone", + "a": "error_prone_annotations", + "v": "2.3.4" + } + ] + }, + { + "path": "donkey/lib/guava/guava-32.0.1-jre.jar", + "sha1": "6e5d51a72d142f2d40a57dfb897188b36a95b489", + "size": 3037368, + "status": "exact", + "matches": [ + { + "g": "com.google.guava", + "a": "guava", + "v": "32.0.1-jre" + } + ] + }, + { + "path": "donkey/lib/guava/failureaccess-1.0.1.jar", + "sha1": "1dcf1de382a0bf95a3d8b0849546c88bac1292c9", + "size": 4617, + "status": "exact", + "matches": [ + { + "g": "com.google.guava", + "a": "failureaccess", + "v": "1.0.1" + } + ] + }, + { + "path": "donkey/lib/guava/j2objc-annotations-1.3.jar", + "sha1": "ba035118bc8bac37d7eff77700720999acd9986d", + "size": 8781, + "status": "exact", + "matches": [ + { + "g": "com.google.j2objc", + "a": "j2objc-annotations", + "v": "1.3" + } + ] + }, + { + "path": "donkey/lib/guava/jsr305-3.0.2.jar", + "sha1": "25ea2e8b0c338a877313bd4672d3fe056ea78f0d", + "size": 19936, + "status": "exact", + "matches": [ + { + "g": "com.google.code.findbugs", + "a": "jsr305", + "v": "3.0.2" + } + ] + }, + { + "path": "donkey/lib/guice-4.1.0.jar", + "sha1": "eeb69005da379a10071aa4948c48d89250febb07", + "size": 674028, + "status": "exact", + "matches": [ + { + "g": "com.google.inject", + "a": "guice", + "v": "4.1.0" + } + ] + }, + { + "path": "donkey/lib/javassist-3.26.0-GA.jar", + "sha1": "bb2890849968d8d8311ffba8c37b0ce16ce284dc", + "size": 782535, + "status": "exact", + "matches": [ + { + "g": "org.javassist", + "a": "javassist", + "v": "3.26.0-GA" + } + ] + }, + { + "path": "donkey/lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", + "sha1": "b421526c5f297295adef1c886e5246c39d4ac629", + "size": 2199, + "status": "exact", + "matches": [ + { + "g": "com.google.guava", + "a": "listenablefuture", + "v": "9999.0-empty-to-avoid-conflict-with-guava" + } + ] + }, + { + "path": "donkey/lib/log4j-1.2-api-2.25.3.jar", + "sha1": "a7e550e638a5e534fd944616c5ae665a67e9501e", + "size": 359213, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-1.2-api", + "v": "2.25.3" + } + ] + }, + { + "path": "donkey/lib/quartz-2.3.2.jar", + "sha1": "18a6d6b5a40b77bd060b34cb9f2acadc4bae7c8a", + "size": 693050, + "status": "exact", + "matches": [ + { + "g": "org.quartz-scheduler", + "a": "quartz", + "v": "2.3.2" + } + ] + }, + { + "path": "donkey/lib/log4j-core-2.25.3.jar", + "sha1": "dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea", + "size": 2018402, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-core", + "v": "2.25.3" + } + ] + }, + { + "path": "donkey/lib/log4j-api-2.25.3.jar", + "sha1": "fb385330d89c2d61058ef649403f214633569205", + "size": 350610, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-api", + "v": "2.25.3" + } + ] + }, + { + "path": "donkey/lib/slf4j-api-1.7.30.jar", + "sha1": "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", + "size": 41472, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-api", + "v": "1.7.30" + } + ] + }, + { + "path": "donkey/lib/xstream/xpp3-1.1.4c.jar", + "sha1": "9b988ea84b9e4e9f1874e390ce099b8ac12cfff5", + "size": 120069, + "status": "exact", + "matches": [ + { + "g": "xpp3", + "a": "xpp3", + "v": "1.1.4c" + } + ] + }, + { + "path": "donkey/lib/slf4j-log4j12-1.7.30.jar", + "sha1": "c21f55139d8141d2231214fb1feaf50a1edca95e", + "size": 12211, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-log4j12", + "v": "1.7.30" + } + ] + }, + { + "path": "donkey/lib/xstream/xstream-1.4.20.jar", + "sha1": "0e2315b8b2e95e9f21697833c8e56cdd9c98a5ee", + "size": 644649, + "status": "exact", + "matches": [ + { + "g": "com.thoughtworks.xstream", + "a": "xstream", + "v": "1.4.20" + } + ] + }, + { + "path": "donkey/testlib/aopalliance-repackaged-2.4.0-b31.jar", + "sha1": "5e7899ad02fd55f5651a5e5d1a70aee421ba2030", + "size": 14765, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "aopalliance-repackaged", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "donkey/testlib/byte-buddy-1.14.13.jar", + "sha1": "45cf516d9a23485200950549ff72b204c307fc9d", + "size": 4212903, + "status": "exact", + "matches": [ + { + "g": "net.bytebuddy", + "a": "byte-buddy", + "v": "1.14.13" + } + ] + }, + { + "path": "donkey/testlib/javax.inject-2.4.0-b31.jar", + "sha1": "04bb71bbdae1064675e36d057bd2c95a00e2e84b", + "size": 5951, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "javax.inject", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "donkey/testlib/byte-buddy-agent-1.14.13.jar", + "sha1": "979ce25f7d3096a2e82214ba7dc972a05ce7a171", + "size": 256811, + "status": "exact", + "matches": [ + { + "g": "net.bytebuddy", + "a": "byte-buddy-agent", + "v": "1.14.13" + } + ] + }, + { + "path": "donkey/testlib/junit-4.8.1.jar", + "sha1": "f2975548f836416306ef1dee748d956f04733915", + "size": 237047, + "status": "exact", + "matches": [ + { + "g": "junit", + "a": "junit", + "v": "4.8.1" + } + ] + }, + { + "path": "donkey/testlib/mockito-core-5.1.1.jar", + "sha1": "31fd75d9d80e678032e5dc1bad17386f192853ea", + "size": 685421, + "status": "exact", + "matches": [ + { + "g": "org.mockito", + "a": "mockito-core", + "v": "5.1.1" + } + ] + }, + { + "path": "donkey/testlib/objenesis-2.5.1.jar", + "sha1": "272bab9a4e5994757044d1fc43ce480c8cb907a4", + "size": 54391, + "status": "exact", + "matches": [ + { + "g": "org.objenesis", + "a": "objenesis", + "v": "2.5.1" + } + ] + }, + { + "path": "generator/lib/commons-collections4-4.4.jar", + "sha1": "62ebe7544cb7164d87e0637a2a6a2bdc981395e8", + "size": 751914, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-collections4", + "v": "4.4" + } + ] + }, + { + "path": "generator/lib/commons-io-2.21.0.jar", + "sha1": "52a6f68fe5afe335cde95461dd5c3412f04996f7", + "size": 585274, + "status": "exact", + "matches": [ + { + "g": "commons-io", + "a": "commons-io", + "v": "2.21.0" + } + ] + }, + { + "path": "generator/lib/log4j-api-2.25.3.jar", + "sha1": "fb385330d89c2d61058ef649403f214633569205", + "size": 350610, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-api", + "v": "2.25.3" + } + ] + }, + { + "path": "generator/lib/commons-lang3-3.20.0.jar", + "sha1": "65897b3e5731220962e659e001904af3c3cbeba9", + "size": 713862, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-lang3", + "v": "3.20.0" + } + ] + }, + { + "path": "generator/lib/log4j-1.2-api-2.25.3.jar", + "sha1": "a7e550e638a5e534fd944616c5ae665a67e9501e", + "size": 359213, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-1.2-api", + "v": "2.25.3" + } + ] + }, + { + "path": "generator/lib/log4j-core-2.25.3.jar", + "sha1": "dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea", + "size": 2018402, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-core", + "v": "2.25.3" + } + ] + }, + { + "path": "generator/lib/slf4j-api-1.7.30.jar", + "sha1": "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", + "size": 41472, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-api", + "v": "1.7.30" + } + ] + }, + { + "path": "generator/lib/velocity-engine-core-2.3.jar", + "sha1": "e2133b723d0e42be74880d34de6bf6538ea7f915", + "size": 531308, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity", + "a": "velocity-engine-core", + "v": "2.3" + } + ] + }, + { + "path": "generator/lib/slf4j-log4j12-1.7.30.jar", + "sha1": "c21f55139d8141d2231214fb1feaf50a1edca95e", + "size": 12211, + "status": "exact", + "matches": [ + { + "g": "org.slf4j", + "a": "slf4j-log4j12", + "v": "1.7.30" + } + ] + }, + { + "path": "server/lib/HikariCP-2.5.1.jar", + "sha1": "b896b711e2d98fedf403de590559a123b5fbf1a6", + "size": 136363, + "status": "exact", + "matches": [ + { + "g": "com.zaxxer", + "a": "HikariCP", + "v": "2.5.1" + } + ] + }, + { + "path": "server/lib/ant/asm-commons-9.2.jar", + "sha1": "f4d7f0fc9054386f2893b602454d48e07d4fbead", + "size": 72642, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-commons", + "v": "9.2" + } + ] + }, + { + "path": "server/lib/ant/ant-contrib-1.0b3.jar", + "sha1": "943cd5c8802b2a3a64a010efb86ec19bac142e40", + "size": 224277, + "status": "exact", + "matches": [ + { + "g": "ant-contrib", + "a": "ant-contrib", + "v": "1.0b3" + } + ] + }, + { + "path": "server/lib/ant/asm-9.2.jar", + "sha1": "81a03f76019c67362299c40e0ba13405f5467bff", + "size": 122004, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm", + "v": "9.2" + } + ] + }, + { + "path": "server/lib/ant/asm-tree-9.2.jar", + "sha1": "d96c99a30f5e1a19b0e609dbb19a44d8518ac01e", + "size": 52660, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-tree", + "v": "9.2" + } + ] + }, + { + "path": "server/lib/ant/org.jacoco.agent-0.8.8.jar", + "sha1": "6ee1de41e73bc9480d23970262d2b00d2a4ed97b", + "size": 267616, + "status": "exact", + "matches": [ + { + "g": "org.jacoco", + "a": "org.jacoco.agent", + "v": "0.8.8" + } + ] + }, + { + "path": "server/lib/ant/org.jacoco.ant-0.8.8.jar", + "sha1": "77363f317d3ddfe4c4fd0cb622ee551baae2faa9", + "size": 35398, + "status": "exact", + "matches": [ + { + "g": "org.jacoco", + "a": "org.jacoco.ant", + "v": "0.8.8" + } + ] + }, + { + "path": "server/lib/ant/org.jacoco.core-0.8.8.jar", + "sha1": "fb1257ce77ec2fe326aad639b2253e76f481ea2e", + "size": 202533, + "status": "exact", + "matches": [ + { + "g": "org.jacoco", + "a": "org.jacoco.core", + "v": "0.8.8" + } + ] + }, + { + "path": "server/lib/ant/org.jacoco.report-0.8.8.jar", + "sha1": "366581c3bc90e2900320c528c294949bad7232c8", + "size": 128884, + "status": "exact", + "matches": [ + { + "g": "org.jacoco", + "a": "org.jacoco.report", + "v": "0.8.8" + } + ] + }, + { + "path": "server/lib/aws/apache-client-2.15.28.jar", + "sha1": "dedb0517e771816ab8c6a507cc6fb65fa9671a4a", + "size": 65744, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "apache-client", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/auth-2.15.28.jar", + "sha1": "91bc27cb508650f8be16146e682acc1844bbb26e", + "size": 133500, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "auth", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/annotations-2.15.28.jar", + "sha1": "04a758cf8d5d0da5d3a7213a96efb2b62f5e92c4", + "size": 7451, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "annotations", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/aws-core-2.15.28.jar", + "sha1": "13a66816b914fa05978d7934b9d65fbe3ddf2561", + "size": 90561, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "aws-core", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/aws-json-protocol-2.15.28.jar", + "sha1": "28d1725f07dee67cdf9269c45130f8abc6d816a3", + "size": 112463, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "aws-json-protocol", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/aws-query-protocol-2.15.28.jar", + "sha1": "ce9f7835fe7f50d9d905a427d35b8fd4fb4776be", + "size": 64423, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "aws-query-protocol", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/aws-xml-protocol-2.15.28.jar", + "sha1": "4a26eb4cd0db4fdabdbdb75d612ea482a133e2fe", + "size": 87702, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "aws-xml-protocol", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/eventstream-1.0.1.jar", + "sha1": "6ff8649dffc5190366ada897ba8525a836297784", + "size": 30193, + "status": "exact", + "matches": [ + { + "g": "software.amazon.eventstream", + "a": "eventstream", + "v": "1.0.1" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar", + "sha1": "5864149b2e5a2af7b05fe9e9dc3e4b70d3060a7c", + "size": 339044, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-buffer", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-codec-4.1.119.Final.jar", + "sha1": "337ca8e8c3ef23925e02d56347b414d7616d1d02", + "size": 355199, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-codec", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar", + "sha1": "23196984df6083cc39bef22a54c6cf5b157f3824", + "size": 676321, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-codec-http", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar", + "sha1": "648b066861723b60635bef2047229ed73d0cbd04", + "size": 491365, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-codec-http2", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-common-4.1.119.Final.jar", + "sha1": "2f7c360b03c0aceab7efc1f7c2b75274f0f35909", + "size": 719224, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-common", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-nio-client-2.20.140.jar", + "sha1": "282625cafb04e5b428a6064ad75005e9323f44dd", + "size": 285065, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "netty-nio-client", + "v": "2.20.140" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-handler-4.1.119.Final.jar", + "sha1": "a0059b8d779ce566b524efd6d73ba4fcff3cd5d9", + "size": 580333, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-handler", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-reactive-streams-2.0.8.jar", + "sha1": "52c055da731b1620ada2f6a23aa6c191993dea3c", + "size": 21495, + "status": "exact", + "matches": [ + { + "g": "com.typesafe.netty", + "a": "netty-reactive-streams", + "v": "2.0.8" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-reactive-streams-http-2.0.8.jar", + "sha1": "4b68ca6184152cac6386924f5d992e2b4c6a4b46", + "size": 33821, + "status": "exact", + "matches": [ + { + "g": "com.typesafe.netty", + "a": "netty-reactive-streams-http", + "v": "2.0.8" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar", + "sha1": "e1f7c90aff71bdf0e2294a200b5f89244f88dcf7", + "size": 37841, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-resolver", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-transport-4.1.119.Final.jar", + "sha1": "d05df879054297962d056b77460fc4ff20e30073", + "size": 521425, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-transport", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar", + "sha1": "500fdc2000a47c07ad6c0ea230127f5ac3c9ad5c", + "size": 40596, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-transport-native-epoll", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar", + "sha1": "55afdeb456bccf8eecb06431f3c1537269afe9af", + "size": 44157, + "status": "exact", + "matches": [ + { + "g": "io.netty", + "a": "netty-transport-native-unix-common", + "v": "4.1.119.Final" + } + ] + }, + { + "path": "server/lib/aws/ext/reactive-streams-1.0.3.jar", + "sha1": "d9fb7a7926ffa635b3dcaa5049fb2bfa25b3e7d0", + "size": 11369, + "status": "exact", + "matches": [ + { + "g": "org.reactivestreams", + "a": "reactive-streams", + "v": "1.0.3" + } + ] + }, + { + "path": "server/lib/aws/http-client-spi-2.15.28.jar", + "sha1": "2c332aade7efa01069519f7bb2d5fe1ed3c6219c", + "size": 61682, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "http-client-spi", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/kms-2.15.28.jar", + "sha1": "1bb2632416a3454039734764a95fb9adc2b4e377", + "size": 1033224, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "kms", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/profiles-2.15.28.jar", + "sha1": "db95fb991e39a2e6205271a7d403db711d52afae", + "size": 26486, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "profiles", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/metrics-spi-2.15.28.jar", + "sha1": "b606a8e9802880260c248969259304ebe65dfa7c", + "size": 18718, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "metrics-spi", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/protocol-core-2.15.28.jar", + "sha1": "c85b66c8eac0df2bce9a1a4cbf7eabd4fc6de846", + "size": 30001, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "protocol-core", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/regions-2.15.28.jar", + "sha1": "b25e279a4fdf0b5dab31627201b68dc6b8d32eb5", + "size": 434672, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "regions", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/sts-2.15.28.jar", + "sha1": "7172fd87ced65f45d10a39f19181cf3f94164241", + "size": 279385, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "sts", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/sdk-core-2.15.28.jar", + "sha1": "376ea57d24d528d4116ba841e2cf05681c80bb5b", + "size": 573234, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "sdk-core", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/s3-2.15.28.jar", + "sha1": "abf57e19f6dfe45debb1d6d72b0af0e96707e6d2", + "size": 2781640, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "s3", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/aws/utils-2.15.28.jar", + "sha1": "bc047a4cd8b6ce45d191a2818b41782c9034c80e", + "size": 108518, + "status": "exact", + "matches": [ + { + "g": "software.amazon.awssdk", + "a": "utils", + "v": "2.15.28" + } + ] + }, + { + "path": "server/lib/backport-util-concurrent-Java60-3.1.jar", + "sha1": "f1fa402cbf5390c4fc09b76e8afce01be476f6bb", + "size": 321201, + "status": "none", + "reason": "no artifact of this name on Maven Central" + }, + { + "path": "server/lib/bcpkix-jdk18on-1.78.1.jar", + "sha1": "17b3541f736df97465f87d9f5b5dfa4991b37bb3", + "size": 1125173, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcpkix-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "server/lib/bcprov-jdk18on-1.78.1.jar", + "sha1": "39e9e45359e20998eb79c1828751f94a818d25f8", + "size": 8324412, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcprov-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "server/lib/bcutil-jdk18on-1.78.1.jar", + "sha1": "5353ca39fe2f148dab9ca1d637a43d0750456254", + "size": 705135, + "status": "exact", + "matches": [ + { + "g": "org.bouncycastle", + "a": "bcutil-jdk18on", + "v": "1.78.1" + } + ] + }, + { + "path": "server/lib/commons/commons-beanutils-1.11.0.jar", + "sha1": "ac03ea606d13de04c2e4508227680faff151f491", + "size": 246806, + "status": "exact", + "matches": [ + { + "g": "commons-beanutils", + "a": "commons-beanutils", + "v": "1.11.0" + } + ] + }, + { + "path": "server/lib/commons/commons-cli-1.2.jar", + "sha1": "2bf96b7aa8b611c177d329452af1dc933e14501c", + "size": 41123, + "status": "exact", + "matches": [ + { + "g": "commons-cli", + "a": "commons-cli", + "v": "1.2" + } + ] + }, + { + "path": "server/lib/classgraph-4.8.179.jar", + "sha1": "f159dd8bbbf381c4006c1f675ec4e648c8317f32", + "size": 576120, + "status": "exact", + "matches": [ + { + "g": "io.github.classgraph", + "a": "classgraph", + "v": "4.8.179" + } + ] + }, + { + "path": "server/lib/commons/commons-codec-1.21.0.jar", + "sha1": "d95f998db5f89900fe895daf6cd2cddcb2f1d64b", + "size": 402494, + "status": "exact", + "matches": [ + { + "g": "commons-codec", + "a": "commons-codec", + "v": "1.21.0" + } + ] + }, + { + "path": "server/lib/commons/commons-collections4-4.4.jar", + "sha1": "62ebe7544cb7164d87e0637a2a6a2bdc981395e8", + "size": 751914, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-collections4", + "v": "4.4" + } + ] + }, + { + "path": "server/lib/commons/commons-compress-1.28.0.jar", + "sha1": "e482f2c7a88dac3c497e96aa420b6a769f59c8d7", + "size": 1117221, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-compress", + "v": "1.28.0" + } + ] + }, + { + "path": "server/lib/commons/commons-collections-3.2.2.jar", + "sha1": "8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5", + "size": 588337, + "status": "exact", + "matches": [ + { + "g": "commons-collections", + "a": "commons-collections", + "v": "3.2.2" + } + ] + }, + { + "path": "server/lib/commons/commons-configuration2-2.13.0.jar", + "sha1": "dc795ed544554745c52d56e0ab5f42529a7cef4e", + "size": 675321, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-configuration2", + "v": "2.13.0" + } + ] + }, + { + "path": "server/lib/commons/commons-dbutils-1.7.jar", + "sha1": "a2d6e515aa87e5d38f6b3003e70b13c1b1f19ca0", + "size": 97075, + "status": "exact", + "matches": [ + { + "g": "commons-dbutils", + "a": "commons-dbutils", + "v": "1.7" + } + ] + }, + { + "path": "server/lib/commons/commons-digester3-3.2.jar", + "sha1": "c3f68c5ff25ec5204470fd8fdf4cb8feff5e8a79", + "size": 241614, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-digester3", + "v": "3.2" + } + ] + }, + { + "path": "server/lib/commons/commons-dbcp2-2.0.1.jar", + "sha1": "dc887691eab129c5728e26b095751fcadd36719d", + "size": 167962, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-dbcp2", + "v": "2.0.1" + } + ] + }, + { + "path": "server/lib/commons/commons-fileupload-1.6.0.jar", + "sha1": "2392704cccb4632b3ccd9b8cfbe2943cca6fc455", + "size": 76956, + "status": "exact", + "matches": [ + { + "g": "commons-fileupload", + "a": "commons-fileupload", + "v": "1.6.0" + } + ] + }, + { + "path": "server/lib/commons/commons-httpclient-3.0.1.jar", + "sha1": "d6364bcc1b2b2aa69d008602d36a700453648560", + "size": 279781, + "status": "exact", + "matches": [ + { + "g": "commons-httpclient", + "a": "commons-httpclient", + "v": "3.0.1" + } + ] + }, + { + "path": "server/lib/commons/commons-el-1.0.jar", + "sha1": "1df2c042b3f2de0124750241ac6c886dbfa2cc2c", + "size": 112341, + "status": "exact", + "matches": [ + { + "g": "tomcat", + "a": "commons-el", + "v": "5.5.23" + }, + { + "g": "commons-el", + "a": "commons-el", + "v": "1.0" + } + ] + }, + { + "path": "server/lib/commons/commons-email-1.6.0.jar", + "sha1": "3fae6004e0c5e1b2b46a2b28e017efcc1a40d6bf", + "size": 65234, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-email", + "v": "1.6.0" + } + ] + }, + { + "path": "server/lib/commons/commons-io-2.21.0.jar", + "sha1": "52a6f68fe5afe335cde95461dd5c3412f04996f7", + "size": 585274, + "status": "exact", + "matches": [ + { + "g": "commons-io", + "a": "commons-io", + "v": "2.21.0" + } + ] + }, + { + "path": "server/lib/commons/commons-logging-1.3.5.jar", + "sha1": "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", + "size": 73737, + "status": "exact", + "matches": [ + { + "g": "commons-logging", + "a": "commons-logging", + "v": "1.3.5" + } + ] + }, + { + "path": "server/lib/commons/commons-lang3-3.20.0.jar", + "sha1": "65897b3e5731220962e659e001904af3c3cbeba9", + "size": 713862, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-lang3", + "v": "3.20.0" + } + ] + }, + { + "path": "server/lib/commons/commons-jxpath-1.3.jar", + "sha1": "c22d7d0f0f40eb7059a23cfa61773a416768b137", + "size": 299994, + "status": "exact", + "matches": [ + { + "g": "commons-jxpath", + "a": "commons-jxpath", + "v": "1.3" + } + ] + }, + { + "path": "server/lib/commons/commons-text-1.15.0.jar", + "sha1": "9899093aa40f0199d6c39b131b8f087cdb37e399", + "size": 264873, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-text", + "v": "1.15.0" + } + ] + }, + { + "path": "server/lib/commons/commons-pool2-2.3.jar", + "sha1": "62a559a025fd890c30364296ece14643ba9c8c5b", + "size": 109568, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-pool2", + "v": "2.3" + } + ] + }, + { + "path": "server/lib/commons/commons-math3-3.0.jar", + "sha1": "5f8d1d720333aa9a7dee1c949ea70d9ed7da6106", + "size": 1285617, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-math3", + "v": "3.0" + } + ] + }, + { + "path": "server/lib/commons/commons-net-3.9.0.jar", + "sha1": "5a4e26802e0a5a42938f987976b55dae4a6cc636", + "size": 316431, + "status": "exact", + "matches": [ + { + "g": "commons-net", + "a": "commons-net", + "v": "3.9.0" + } + ] + }, + { + "path": "server/lib/commons/httpcore-4.4.13.jar", + "sha1": "853b96d3afbb7bf8cc303fe27ee96836a10c1834", + "size": 328593, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpcore", + "v": "4.4.13" + } + ] + }, + { + "path": "server/lib/commons/httpmime-4.5.13.jar", + "sha1": "efc110bad4a0d45cda7858e6beee1d8a8313da5a", + "size": 41790, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpmime", + "v": "4.5.13" + } + ] + }, + { + "path": "server/lib/commons/httpclient-4.5.13.jar", + "sha1": "e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada", + "size": 780321, + "status": "exact", + "matches": [ + { + "g": "org.apache.httpcomponents", + "a": "httpclient", + "v": "4.5.13" + } + ] + }, + { + "path": "server/lib/commons/commons-vfs2-2.10.0.jar", + "sha1": "a306167fdb88152403c8b00595b1502ffacd5b76", + "size": 534044, + "status": "exact", + "matches": [ + { + "g": "org.apache.commons", + "a": "commons-vfs2", + "v": "2.10.0" + } + ] + }, + { + "path": "server/lib/database/derby-10.10.2.0.jar", + "sha1": "47eba6736561c377f2132f5e09e2fe8084d899a9", + "size": 2838580, + "status": "exact", + "matches": [ + { + "g": "org.apache.derby", + "a": "derby", + "v": "10.10.2.0" + } + ] + }, + { + "path": "server/lib/database/jtds-1.3.1.jar", + "sha1": "1fc4d17efa80dc375767b0c1006584175212e9dc", + "size": 317816, + "status": "none", + "reason": "content identical to Central net.sourceforge.jtds:jtds:1.3.1 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/database/derbytools-10.10.2.0.jar", + "sha1": "3a81714e5b3970ca8b19199b1a18124d678aa274", + "size": 214415, + "status": "exact", + "matches": [ + { + "g": "org.apache.derby", + "a": "derbytools", + "v": "10.10.2.0" + } + ] + }, + { + "path": "server/lib/database/mssql-jdbc-8.4.1.jre8.jar", + "sha1": "b5ffea221217c051429a6d2af974ee7341765424", + "size": 1300915, + "status": "exact", + "matches": [ + { + "g": "com.microsoft.sqlserver", + "a": "mssql-jdbc", + "v": "8.4.1.jre8" + } + ] + }, + { + "path": "server/lib/database/mysql-connector-j-8.4.0.jar", + "sha1": "b1bc0f47bcad26ad5f9bceefb63fcb920d868fca", + "size": 2533399, + "status": "exact", + "matches": [ + { + "g": "com.mysql", + "a": "mysql-connector-j", + "v": "8.4.0" + } + ] + }, + { + "path": "server/lib/database/ojdbc8-12.2.0.1.jar", + "sha1": "60f439fd01536508df32658d0a416c49ac6f07fb", + "size": 4036257, + "status": "exact", + "matches": [ + { + "g": "com.oracle.database.jdbc", + "a": "ojdbc8", + "v": "12.2.0.1" + } + ] + }, + { + "path": "server/lib/database/postgresql-42.7.8.jar", + "sha1": "81b840fbfe0a6c0b7aa14c6bd4856108d36ed780", + "size": 1116727, + "status": "exact", + "matches": [ + { + "g": "org.postgresql", + "a": "postgresql", + "v": "42.7.8" + } + ], + "note": "verified directly against repo1.maven.org .jar.sha1; absent from the Central search checksum index" + }, + { + "path": "server/lib/database/sqlite-jdbc-3.43.2.1.jar", + "sha1": "e7ddc09b47cd6c0359787f780b0da4590b002d82", + "size": 13210296, + "status": "none", + "reason": "content identical to Central org.xerial:sqlite-jdbc:3.43.2.1 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/extensions/dimse/dcm4che-core-2.0.29.jar", + "sha1": "e391b27258b3b3502741da7349cd445862a4251a", + "size": 402832, + "status": "none", + "reason": "dcm4che 2.x was distributed from dcm4che.org, never published to Maven Central" + }, + { + "path": "server/lib/extensions/dicomviewer/ij.jar", + "sha1": "1874a949b2470b4a9d3b156a66df8965620b4059", + "size": 1412198, + "status": "exact", + "matches": [ + { + "g": "gov.nih.imagej", + "a": "imagej", + "v": "1.42" + } + ] + }, + { + "path": "server/lib/extensions/dimse/dcm4che-filecache-2.0.29.jar", + "sha1": "325974a666514da180c911eb5d0442cc4bfa590f", + "size": 9461, + "status": "none", + "reason": "dcm4che 2.x was distributed from dcm4che.org, never published to Maven Central" + }, + { + "path": "server/lib/extensions/dimse/dcm4che-net-2.0.29.jar", + "sha1": "056fa089209b4d4e5e74f970cb21104c0cc31b7b", + "size": 122692, + "status": "none", + "reason": "dcm4che 2.x was distributed from dcm4che.org, never published to Maven Central" + }, + { + "path": "server/lib/extensions/dimse/jai_imageio.jar", + "sha1": "d6e1cff914c758b42635331f8884714e363886f1", + "size": 927714, + "status": "none", + "reason": "no version published to Maven Central under the same artifact name matches these bytes; java.net-era JAI ImageIO build (same naming convention as the client copy)" + }, + { + "path": "server/lib/extensions/dimse/dcm4che-tool-dcmsnd-2.0.29.jar", + "sha1": "509913bfb3db518b842a7a076c167bad3a158287", + "size": 25437, + "status": "none", + "reason": "dcm4che 2.x was distributed from dcm4che.org, never published to Maven Central" + }, + { + "path": "server/lib/extensions/dimse/dcm4che-tool-dcmrcv-2.0.29.jar", + "sha1": "722eed634d852a62f62c464f5ba8734cdb29c1b2", + "size": 23181, + "status": "none", + "reason": "dcm4che 2.x was distributed from dcm4che.org, never published to Maven Central" + }, + { + "path": "server/lib/extensions/doc/flying-saucer-core-9.0.1.jar", + "sha1": "9a41783e38c66aac1b6ebb6b0fa48434697c1144", + "size": 1106175, + "status": "exact", + "matches": [ + { + "g": "org.xhtmlrenderer", + "a": "flying-saucer-core", + "v": "9.0.1" + } + ] + }, + { + "path": "server/lib/extensions/doc/itext-2.1.7.jar", + "sha1": "892bfb3e97074a61123b3b2d7caa2db112750864", + "size": 1130070, + "status": "exact", + "matches": [ + { + "g": "com.lowagie", + "a": "itext", + "v": "2.1.7" + } + ] + }, + { + "path": "server/lib/extensions/doc/flying-saucer-pdf-9.0.1.jar", + "sha1": "ce4a7b619c7c2aff466f23a831bd4655471e2d81", + "size": 105089, + "status": "exact", + "matches": [ + { + "g": "org.xhtmlrenderer", + "a": "flying-saucer-pdf", + "v": "9.0.1" + } + ] + }, + { + "path": "server/lib/extensions/doc/graphics2d-0.32.jar", + "sha1": "d8892871a9a1446e94f25eb625a7eec3bfa31b15", + "size": 73911, + "status": "exact", + "matches": [ + { + "g": "de.rototor.pdfbox", + "a": "graphics2d", + "v": "0.32" + } + ] + }, + { + "path": "server/lib/extensions/doc/fontbox-2.0.24.jar", + "sha1": "df8ecb3006dfcd52355a5902096e5ec34f06112e", + "size": 1564111, + "status": "exact", + "matches": [ + { + "g": "org.apache.pdfbox", + "a": "fontbox", + "v": "2.0.24" + } + ] + }, + { + "path": "server/lib/extensions/doc/openhtmltopdf-pdfbox-1.0.9.jar", + "sha1": "449d6821c69b9c932cfec845aa08e9de1f8c52a6", + "size": 259024, + "status": "exact", + "matches": [ + { + "g": "com.openhtmltopdf", + "a": "openhtmltopdf-pdfbox", + "v": "1.0.9" + } + ] + }, + { + "path": "server/lib/extensions/doc/itext-rtf-2.1.7.jar", + "sha1": "ed1cbe69ff69c6e6fa7645f51c8d25894a177e7b", + "size": 157360, + "status": "exact", + "matches": [ + { + "g": "com.lowagie", + "a": "itext-rtf", + "v": "2.1.7" + } + ] + }, + { + "path": "server/lib/extensions/doc/openhtmltopdf-core-1.0.9.jar", + "sha1": "922087a3c59a3a03e9cd77705e584520fff83cf4", + "size": 998825, + "status": "exact", + "matches": [ + { + "g": "com.openhtmltopdf", + "a": "openhtmltopdf-core", + "v": "1.0.9" + } + ] + }, + { + "path": "server/lib/extensions/doc/pdfbox-2.0.24.jar", + "sha1": "cb562ee5f43e29415af4477e62fbe668ef88d18b", + "size": 2745079, + "status": "exact", + "matches": [ + { + "g": "org.apache.pdfbox", + "a": "pdfbox", + "v": "2.0.24" + } + ] + }, + { + "path": "server/lib/extensions/doc/xmpbox-2.0.24.jar", + "sha1": "df8b7a6a363281f9f1365ed4b37580aa5d3f38f1", + "size": 132350, + "status": "exact", + "matches": [ + { + "g": "org.apache.pdfbox", + "a": "xmpbox", + "v": "2.0.24" + } + ] + }, + { + "path": "server/lib/extensions/file/webdavclient4j-core-0.92.jar", + "sha1": "70e15b537543c427b2cdb01ef4102818b8336f08", + "size": 192186, + "status": "none", + "reason": "no artifact of this name on Maven Central" + }, + { + "path": "server/lib/extensions/pdfviewer/PDFRenderer.jar", + "sha1": "64bb55c092cc3f82e241fcb59ce8c60f54cd9ebe", + "size": 2069715, + "status": "none", + "reason": "no version published to Maven Central under the same artifact name matches these bytes; java.net-era PDF renderer, kept vendored" + }, + { + "path": "server/lib/extensions/file/jcifs-ng-2.1.10.jar", + "sha1": "94b4c0b173540ae98c379ea278713665fd8ab3eb", + "size": 822626, + "status": "exact", + "matches": [ + { + "g": "eu.agno3.jcifs", + "a": "jcifs-ng", + "v": "2.1.10" + } + ] + }, + { + "path": "server/lib/guice-4.1.0.jar", + "sha1": "eeb69005da379a10071aa4948c48d89250febb07", + "size": 674028, + "status": "exact", + "matches": [ + { + "g": "com.google.inject", + "a": "guice", + "v": "4.1.0" + } + ] + }, + { + "path": "server/lib/extensions/ws/wsdl4j-1.6.2-fixed.jar", + "sha1": "ac708fdfb97d144b425f8f6335a938c2fa0dea0a", + "size": 148578, + "status": "none", + "reason": "version 1.6.2-fixed never published to Central (artifact exists; recent versions: 1.6.2, 1.6.3, 1.6.3.wso2v1, 1.6.3.wso2v2, 1.6.3.wso2v3)" + }, + { + "path": "server/lib/hapi/hapi-structures-v21-2.3.jar", + "sha1": "d48417a1908e4e4694dc3d3f6450aefb8bb80717", + "size": 174988, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v21:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-base-2.3.jar", + "sha1": "90e1b36af965c950d70de0a657ff224a8086b28e", + "size": 663899, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-base:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v231-2.3.jar", + "sha1": "aeb04355e85cbd55d0612ab78aa511f7cb2b4165", + "size": 1270056, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v231:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v23-2.3.jar", + "sha1": "7610cbc40f2ce4a1fbdd831979ef42dd2088cf70", + "size": 1997093, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v23:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v22-2.3.jar", + "sha1": "fa5132c6c657a7f1eaa1497111d4e36b32c6cc81", + "size": 407491, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v22:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v24-2.3.jar", + "sha1": "f9689d6a75a9248fb528f3b0d8b17e07692213e1", + "size": 1461319, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v24:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v26-2.3.jar", + "sha1": "5ceccab8f5c4d62eec7fee84e184f8e133615a94", + "size": 2083091, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v26:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v251-2.3.jar", + "sha1": "1f5addbadb0930471d976178a22995f9f7f673e2", + "size": 1883758, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v251:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v25-2.3.jar", + "sha1": "d2f4791e7139d259e107d384d1cb91c81b221868", + "size": 1890603, + "status": "none", + "reason": "content identical to Central ca.uhn.hapi:hapi-structures-v25:2.3 (verified entry by entry); only the zip container/packaging differs. Kept vendored under the file-level SHA-exact policy; adopting the Central coordinate is a safe documented follow-up." + }, + { + "path": "server/lib/hapi/hapi-structures-v27-2.3.jar", + "sha1": "3f7d410710a30ec72a5bf02fed897630d18347ae", + "size": 2219604, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v27", + "v": "2.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-core-2.14.3.jar", + "sha1": "4fa101f81504ed6811bf1823270adb51a9b45ff3", + "size": 473081, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-core", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-annotations-2.14.3.jar", + "sha1": "b49701acb02b8e95ae1967821cfbafc220cf5795", + "size": 76636, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-annotations", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/hapi/hapi-structures-v281-2.3.jar", + "sha1": "254204a380b95bf842c8f3882b49621b81a4a97c", + "size": 2402047, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v281", + "v": "2.3" + } + ] + }, + { + "path": "server/lib/hapi/hapi-structures-v28-2.3.jar", + "sha1": "3afe23ad8d7345bd63d4ba2a2814e291930c3621", + "size": 2341924, + "status": "exact", + "matches": [ + { + "g": "ca.uhn.hapi", + "a": "hapi-structures-v28", + "v": "2.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-databind-2.14.3.jar", + "sha1": "ba0373b04bf0f03b0cd268cd2e5e8444aaaf9208", + "size": 1617187, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.core", + "a": "jackson-databind", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-dataformat-cbor-2.14.3.jar", + "sha1": "081ec6810ce709a0add92533470903dee97695f6", + "size": 64894, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.dataformat", + "a": "jackson-dataformat-cbor", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-dataformat-yaml-2.14.3.jar", + "sha1": "cf8550a0c965aa3a4d08c3857e3f44dae9db9f8b", + "size": 54274, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.dataformat", + "a": "jackson-dataformat-yaml", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/jackson/jackson-datatype-jsr310-2.14.3.jar", + "sha1": "35f7f751c3555dadccb6f173f9ac1e035a648da3", + "size": 122545, + "status": "exact", + "matches": [ + { + "g": "com.fasterxml.jackson.datatype", + "a": "jackson-datatype-jsr310", + "v": "2.14.3" + } + ] + }, + { + "path": "server/lib/java-semver-0.10.2.jar", + "sha1": "0502f9bd3596181449222c16c6ad7108e320dce3", + "size": 52003, + "status": "exact", + "matches": [ + { + "g": "com.github.zafarkhaja", + "a": "java-semver", + "v": "0.10.2" + } + ] + }, + { + "path": "server/lib/jackson/snakeyaml-2.5.jar", + "sha1": "2d53ddec134280cb384c1e35d094e5f71c1f2316", + "size": 340015, + "status": "exact", + "matches": [ + { + "g": "org.yaml", + "a": "snakeyaml", + "v": "2.5" + } + ], + "note": "verified directly against repo1.maven.org .jar.sha1; absent from the Central search checksum index" + }, + { + "path": "server/lib/javassist-3.26.0-GA.jar", + "sha1": "bb2890849968d8d8311ffba8c37b0ce16ce284dc", + "size": 782535, + "status": "exact", + "matches": [ + { + "g": "org.javassist", + "a": "javassist", + "v": "3.26.0-GA" + } + ] + }, + { + "path": "server/lib/javax/jakarta.activation-1.2.1.jar", + "sha1": "8013606426a73d8ba6b568370877251e91a38b89", + "size": 65690, + "status": "exact", + "matches": [ + { + "g": "com.sun.activation", + "a": "jakarta.activation", + "v": "1.2.1" + } + ] + }, + { + "path": "server/lib/javax/jakarta.mail-1.6.7.jar", + "sha1": "319df0e9d536c1a01acdfe49b6e82b97d2393073", + "size": 676654, + "status": "exact", + "matches": [ + { + "g": "com.sun.mail", + "a": "jakarta.mail", + "v": "1.6.7" + } + ] + }, + { + "path": "server/lib/javax/javax.activation-api-1.2.0.jar", + "sha1": "85262acf3ca9816f9537ca47d5adeabaead7cb16", + "size": 56674, + "status": "exact", + "matches": [ + { + "g": "one.gfw", + "a": "javax.activation-api", + "v": "1.2.0" + }, + { + "g": "javax.activation", + "a": "javax.activation-api", + "v": "1.2.0" + } + ] + }, + { + "path": "server/lib/javax/javax.inject-2.4.0-b31.jar", + "sha1": "04bb71bbdae1064675e36d057bd2c95a00e2e84b", + "size": 5951, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "javax.inject", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "server/lib/javax/javax.annotation-api-1.3.2.jar", + "sha1": "934c04d3cfef185a8008e7bf34331b79730a9d43", + "size": 26586, + "status": "exact", + "matches": [ + { + "g": "one.gfw", + "a": "javax.annotation-api", + "v": "1.3.2" + }, + { + "g": "javax.annotation", + "a": "javax.annotation-api", + "v": "1.3.2" + } + ] + }, + { + "path": "server/lib/javax/javax.json-1.0.4.jar", + "sha1": "3178f73569fd7a1e5ffc464e680f7a8cc784b85a", + "size": 85147, + "status": "exact", + "matches": [ + { + "g": "org.glassfish", + "a": "javax.json", + "v": "1.0.4" + } + ] + }, + { + "path": "server/lib/javax/javax.json-api-1.0.jar", + "sha1": "0a74939ecbf7294b40accb4048929577f5ddcee2", + "size": 19754, + "status": "exact", + "matches": [ + { + "g": "javax.json", + "a": "javax.json-api", + "v": "1.0" + } + ] + }, + { + "path": "server/lib/javax/javax.servlet-api-3.1.0.jar", + "sha1": "3cd63d075497751784b2fa84be59432f4905bf7c", + "size": 95806, + "status": "exact", + "matches": [ + { + "g": "javax.servlet", + "a": "javax.servlet-api", + "v": "3.1.0" + } + ] + }, + { + "path": "server/lib/javax/javax.ws.rs-api-2.0.1.jar", + "sha1": "104e9c2b5583cfcfeac0402316221648d6d8ea6b", + "size": 115534, + "status": "exact", + "matches": [ + { + "g": "javax.ws.rs", + "a": "javax.ws.rs-api", + "v": "2.0.1" + } + ] + }, + { + "path": "server/lib/javax/jaxb/ext/istack-commons-runtime-3.0.6.jar", + "sha1": "ef4d2cd80d5b79b8dbe689fb2d7fbfb61cf494f4", + "size": 25469, + "status": "none", + "reason": "version 3.0.6 never published to Central (artifact exists; recent versions: 4.1.0, 4.1.0-M1, 4.1.1, 4.1.2, 4.2.0)" + }, + { + "path": "server/lib/javax/jaxb/jaxb-runtime-2.4.0-b180725.0644.jar", + "sha1": "a98b5ac2580f5870049c008021c77e0b918d04ee", + "size": 1093480, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jaxb", + "a": "jaxb-runtime", + "v": "2.4.0-b180725.0644" + } + ] + }, + { + "path": "server/lib/javax/jaxb/jaxb-api-2.4.0-b180725.0427.jar", + "sha1": "7400ad346870308bcc46bb60f3c553af3e331b4d", + "size": 128036, + "status": "exact", + "matches": [ + { + "g": "javax.xml.bind", + "a": "jaxb-api", + "v": "2.4.0-b180725.0427" + } + ] + }, + { + "path": "server/lib/javax/jaxb/ext/txw2-2.4.0-b180725.0644.jar", + "sha1": "bcdf56b35b4a02d47dbff7fd2f109ea7eff58fcc", + "size": 70324, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jaxb", + "a": "txw2", + "v": "2.4.0-b180725.0644" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/gmbal-api-only-3.1.0.b001.jar", + "sha1": "3502c55c7ad2085ece6b38202b5169dd9177e0a2", + "size": 21820, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.gmbal", + "a": "gmbal-api-only", + "v": "3.1.0-b001" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/ha-api-3.1.9.jar", + "sha1": "c68b600634d4d4bae3fc54575ae850e734dc1af5", + "size": 36383, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.ha", + "a": "ha-api", + "v": "3.1.9" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/FastInfoset-1.2.13.jar", + "sha1": "098f56b9354e27bd2941cc5d461344e240ae51ae", + "size": 296714, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.fastinfoset", + "a": "FastInfoset", + "v": "1.2.13" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/jsr181-api-1.0.jar", + "sha1": "401cc1d0e5f0d8f4d0532a54928ceaa27ec21258", + "size": 7989, + "status": "exact", + "matches": [ + { + "g": "javax.jws", + "a": "jsr181-api", + "v": "1.0-MR1" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/management-api-3.2.1.b001.jar", + "sha1": "df04c42487612c98d222f6400e9fb71bea484bf3", + "size": 45142, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.external", + "a": "management-api", + "v": "3.2.1-b001" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/mimepull-1.9.7.jar", + "sha1": "3085dfe507b6ce43c1fcc60f228d65a7731b8e7d", + "size": 63985, + "status": "exact", + "matches": [ + { + "g": "org.jvnet.mimepull", + "a": "mimepull", + "v": "1.9.7" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/policy-2.7.2.jar", + "sha1": "fd229ae6c09af1a72105f8d43c6911b0ddccbc79", + "size": 179038, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.ws", + "a": "policy", + "v": "2.7.2" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/saaj-impl-1.0.jar", + "sha1": "6bfb1664ab42506a6547a3972395ea3f5b59ef6c", + "size": 498924, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.messaging.saaj", + "a": "saaj-impl", + "v": "1.4.0" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/streambuffer-1.5.4.jar", + "sha1": "fa88707c78bb5f1e5dff5149622625acaa9c6682", + "size": 68619, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.stream.buffer", + "a": "streambuffer", + "v": "1.5.4" + } + ] + }, + { + "path": "server/lib/javax/jaxws/ext/stax-ex-1.8.jar", + "sha1": "8cc35f73da321c29973191f2cf143d29d26a1df7", + "size": 36073, + "status": "exact", + "matches": [ + { + "g": "org.jvnet.staxex", + "a": "stax-ex", + "v": "1.8" + } + ] + }, + { + "path": "server/lib/javax/jaxws/jaxws-api-2.3.0.jar", + "sha1": "82db2dfe70624d6ed1e93737abfbb0a4df084a89", + "size": 52437, + "status": "exact", + "matches": [ + { + "g": "javax.xml.ws", + "a": "jaxws-api", + "v": "2.3.0" + } + ] + }, + { + "path": "server/lib/javax/jaxws/javax.xml.soap-api-1.4.0.jar", + "sha1": "667ef2eee594ca7e05a1cbe0b37a428f7b57778f", + "size": 46111, + "status": "exact", + "matches": [ + { + "g": "javax.xml.soap", + "a": "javax.xml.soap-api", + "v": "1.4.0" + } + ] + }, + { + "path": "server/lib/javax/jaxws/jaxws-rt-2.3.0.2.jar", + "sha1": "bdaed53c7730b487cd4f3fac8a667e2cfe3842c8", + "size": 2606673, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.ws", + "a": "jaxws-rt", + "v": "2.3.0.2" + } + ] + }, + { + "path": "server/lib/jdom2-2.0.6.1.jar", + "sha1": "dc15dff8f701b227ee523eeb7a17f77c10eafe2f", + "size": 327806, + "status": "exact", + "matches": [ + { + "g": "org.jdom", + "a": "jdom2", + "v": "2.0.6.1" + } + ] + }, + { + "path": "server/lib/javax/jaxws/jaxws-tools-2.3.0.2.jar", + "sha1": "c371a4642c92d810946a93e08404ea72da7a462a", + "size": 901211, + "status": "exact", + "matches": [ + { + "g": "com.sun.xml.ws", + "a": "jaxws-tools", + "v": "2.3.0.2" + } + ] + }, + { + "path": "server/lib/jersey/ext/aopalliance-repackaged-2.4.0-b31.jar", + "sha1": "5e7899ad02fd55f5651a5e5d1a70aee421ba2030", + "size": 14765, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2.external", + "a": "aopalliance-repackaged", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "server/lib/jersey/ext/asm-9.6.jar", + "sha1": "aa205cf0a06dbd8e04ece91c0b37c3f5d567546a", + "size": 123598, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm", + "v": "9.6" + } + ] + }, + { + "path": "server/lib/jersey/ext/asm-analysis-9.6.jar", + "sha1": "9ce6c7b174bd997fc2552dff47964546bd7a5ec3", + "size": 34041, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-analysis", + "v": "9.6" + } + ] + }, + { + "path": "server/lib/jersey/ext/asm-commons-9.6.jar", + "sha1": "f1a9e5508eff490744144565c47326c8648be309", + "size": 72194, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-commons", + "v": "9.6" + } + ] + }, + { + "path": "server/lib/jersey/ext/asm-tree-9.6.jar", + "sha1": "c0cdda9d211e965d2a4448aa3fd86110f2f8c2de", + "size": 51935, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-tree", + "v": "9.6" + } + ] + }, + { + "path": "server/lib/jersey/ext/hk2-api-2.4.0-b31.jar", + "sha1": "c4b5f6c426f8e412e606332b93b7cf745a9a12c5", + "size": 173037, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-api", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "server/lib/jersey/ext/asm-util-9.6.jar", + "sha1": "f77caf84eb93786a749b2baa40865b9613e3eaee", + "size": 91131, + "status": "exact", + "matches": [ + { + "g": "org.ow2.asm", + "a": "asm-util", + "v": "9.6" + } + ] + }, + { + "path": "server/lib/jersey/ext/hk2-utils-2.4.0-b31.jar", + "sha1": "2c5cb698cfec8dde859c3db854178d03bf7248a6", + "size": 101088, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-utils", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "server/lib/jersey/ext/hk2-locator-2.4.0-b31.jar", + "sha1": "436d6e1ad2b0a3aee939c6e05983b007b3578142", + "size": 179705, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "hk2-locator", + "v": "2.4.0-b31" + } + ] + }, + { + "path": "server/lib/jersey/ext/org.osgi.core-4.2.0.jar", + "sha1": "66ab449ff3aa5c4adfc82c89025cc983b422eb95", + "size": 246924, + "status": "exact", + "matches": [ + { + "g": "org.osgi", + "a": "org.osgi.core", + "v": "4.2.0" + } + ] + }, + { + "path": "server/lib/jersey/ext/validation-api-1.1.0.Final.jar", + "sha1": "8613ae82954779d518631e05daa73a6a954817d5", + "size": 63777, + "status": "exact", + "matches": [ + { + "g": "javax.validation", + "a": "validation-api", + "v": "1.1.0.Final" + } + ] + }, + { + "path": "server/lib/jersey/ext/persistence-api-1.0.jar", + "sha1": "5725f57873e05e068803e2bf9d5a8ea3740ffec5", + "size": 52150, + "status": "exact", + "matches": [ + { + "g": "javax.persistence", + "a": "persistence-api", + "v": "1.0" + } + ] + }, + { + "path": "server/lib/jersey/ext/osgi-resource-locator-1.0.1.jar", + "sha1": "4ed2b2d4738aed5786cfa64cba5a332779c4c708", + "size": 20235, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.hk2", + "a": "osgi-resource-locator", + "v": "1.0.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-common-2.22.1.jar", + "sha1": "b5811d8385766f35d10d204952f3d5b57ee2fb60", + "size": 696004, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-common", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-container-jetty-servlet-2.22.1.jar", + "sha1": "e411f21cba67f8d6aa5986577066d1c924524270", + "size": 6912, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.containers", + "a": "jersey-container-jetty-servlet", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-client-2.22.1.jar", + "sha1": "e39297ef90f4b9bdf0a61b6fa73ae275c1b6e8f1", + "size": 163417, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-client", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-container-jetty-http-2.22.1.jar", + "sha1": "ed2d61d3a5332207da65181eb269ad31c6dac864", + "size": 26935, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.containers", + "a": "jersey-container-jetty-http", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-container-servlet-2.22.1.jar", + "sha1": "5a4c27e0271867c212c8cdf730db56898f106041", + "size": 16610, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.containers", + "a": "jersey-container-servlet", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-guava-2.22.1.jar", + "sha1": "2b79eb893818539370899c24893fac9b2fdc4dbd", + "size": 971278, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.bundles.repackaged", + "a": "jersey-guava", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-container-servlet-core-2.22.1.jar", + "sha1": "0d3fb3002ebb5fb5ef4cce370641dbb10bf993b8", + "size": 64787, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.containers", + "a": "jersey-container-servlet-core", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-media-jaxb-2.22.1.jar", + "sha1": "1bc910febfe9e07f741920ff5ac24bb8a59f649f", + "size": 72738, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.media", + "a": "jersey-media-jaxb", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-media-multipart-2.22.1.jar", + "sha1": "c68e535f2395fa961a0903dac0ae32641768d4b6", + "size": 68019, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.media", + "a": "jersey-media-multipart", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jersey/jersey-proxy-client-2.22.1.jar", + "sha1": "20163533fe4e4cb7c3116388640d85d31625b3b2", + "size": 9603, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.ext", + "a": "jersey-proxy-client", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jetty/jetty-annotations-9.4.57.v20241219.jar", + "sha1": "ca47da3c71d715ce005b420af566b9786829a04d", + "size": 86694, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-annotations", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jersey/jersey-server-2.22.1.jar", + "sha1": "20eee7b976e7005a40f05c0965dd76a308689e98", + "size": 951633, + "status": "exact", + "matches": [ + { + "g": "org.glassfish.jersey.core", + "a": "jersey-server", + "v": "2.22.1" + } + ] + }, + { + "path": "server/lib/jetty/jetty-continuation-9.4.57.v20241219.jar", + "sha1": "c2bf5c810049fe23945f737a3c4743da81baa62d", + "size": 25372, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-continuation", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-http-9.4.57.v20241219.jar", + "sha1": "c7a3a9c599346708894cf355e03105937f45f427", + "size": 249911, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-http", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-io-9.4.57.v20241219.jar", + "sha1": "bd0ca6e5c4314972cd91f427fa09dedfe3b84ff5", + "size": 183011, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-io", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-jndi-9.4.57.v20241219.jar", + "sha1": "9ec603efd530c70302949004db592b6b447b785e", + "size": 46751, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-jndi", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-rewrite-9.4.57.v20241219.jar", + "sha1": "c38734a0465dfc80c0eacf912f2cf791038b2096", + "size": 44668, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-rewrite", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-security-9.4.57.v20241219.jar", + "sha1": "2b545f68d45b947fdc6e279a0e8ae3630ec10e05", + "size": 118496, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-security", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-schemas-3.1.2.jar", + "sha1": "e4fb7fb14038a35ac135a784180f8a51a518eab1", + "size": 200419, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty.toolchain", + "a": "jetty-schemas", + "v": "3.1.2" + } + ] + }, + { + "path": "server/lib/jetty/jetty-plus-9.4.57.v20241219.jar", + "sha1": "b7c03e553743011f4fed7d91fa8aae9fa91524de", + "size": 65607, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-plus", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-server-9.4.57.v20241219.jar", + "sha1": "ad3baf52b98b4a32f5714fe2e58ac0e502b4e4d8", + "size": 739348, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-server", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-servlet-9.4.57.v20241219.jar", + "sha1": "3e648eebddbf5ad0c0f7698e50c6a69c4a77fd95", + "size": 146064, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-servlet", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-util-9.4.57.v20241219.jar", + "sha1": "7bf7ea75644ac064199e1e32c66ccd312239f2dc", + "size": 588962, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-util", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar", + "sha1": "7b5f144a3d0cbfcac62f2fcb9e14ffa765048f0e", + "size": 66643, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-util-ajax", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-webapp-9.4.57.v20241219.jar", + "sha1": "3ef93ab9a81547d0def15b8a2d1d6bed7da4bb9c", + "size": 140308, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-webapp", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jetty-xml-9.4.57.v20241219.jar", + "sha1": "bfec69b645695b670435016d3ec733656f4f6818", + "size": 68894, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "jetty-xml", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar", + "sha1": "cfa4623d251e847f08d27fb6d6a78f271467002a", + "size": 21217, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jetty", + "a": "apache-jsp", + "v": "9.4.57.v20241219" + } + ] + }, + { + "path": "server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar", + "sha1": "9b9783ccb2a323383e6e20e36d368f8997b71967", + "size": 206430, + "status": "exact", + "matches": [ + { + "g": "org.apache.taglibs", + "a": "taglibs-standard-impl", + "v": "1.2.5" + } + ] + }, + { + "path": "server/lib/jetty/jsp/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar", + "sha1": "c3bb98c30f75fef1e229d1d03cf8457de22f1ba0", + "size": 40153, + "status": "exact", + "matches": [ + { + "g": "org.apache.taglibs", + "a": "taglibs-standard-spec", + "v": "1.2.5" + } + ] + }, + { + "path": "server/lib/jetty/jsp/org.eclipse.jdt.ecj-3.19.0.jar", + "sha1": "99ccdf7b2a75afb720270ab888bb21d6159ee631", + "size": 2884633, + "status": "exact", + "matches": [ + { + "g": "org.eclipse.jdt", + "a": "ecj", + "v": "3.19.0" + } + ] + }, + { + "path": "server/lib/jetty/jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar", + "sha1": "67515d2ae96e9cb442659668b6a58423f112b5ed", + "size": 1050846, + "status": "exact", + "matches": [ + { + "g": "org.mortbay.jasper", + "a": "apache-jsp", + "v": "8.5.70" + } + ] + }, + { + "path": "server/lib/jetty/jsp/org.mortbay.jasper.apache-el-8.5.70.jar", + "sha1": "e280d60a1b02f85babcc20ed53d603def113f853", + "size": 256317, + "status": "exact", + "matches": [ + { + "g": "org.mortbay.jasper", + "a": "apache-el", + "v": "8.5.70" + } + ] + }, + { + "path": "server/lib/jms/geronimo-jms_1.1_spec-1.1.1.jar", + "sha1": "c872b46c601d8dc03633288b81269f9e42762cea", + "size": 32359, + "status": "exact", + "matches": [ + { + "g": "org.apache.geronimo.specs", + "a": "geronimo-jms_1.1_spec", + "v": "1.1.1" + } + ] + }, + { + "path": "server/lib/jms/geronimo-j2ee-management_1.1_spec-1.0.1.jar", + "sha1": "5372615b0c04c1913c95c34a0414cef720ca2855", + "size": 20220, + "status": "exact", + "matches": [ + { + "g": "org.apache.geronimo.specs", + "a": "geronimo-j2ee-management_1.1_spec", + "v": "1.0.1" + } + ] + }, + { + "path": "server/lib/jna-platform-4.5.2.jar", + "sha1": "741853c07152f6c0fef5194efa6b2dabac22e9c0", + "size": 2327597, + "status": "exact", + "matches": [ + { + "g": "net.java.dev.jna", + "a": "jna-platform", + "v": "4.5.2" + } + ] + }, + { + "path": "server/lib/jna-4.5.2.jar", + "sha1": "35d000afbaa4ed425d91873b40f4df9b8236875b", + "size": 1484022, + "status": "exact", + "matches": [ + { + "g": "net.java.dev.jna", + "a": "jna", + "v": "4.5.2" + } + ] + }, + { + "path": "server/lib/jsch-2.27.7.jar", + "sha1": "068a902807ca6e1c56a6418ff3312a1fd2a77bc7", + "size": 562567, + "status": "exact", + "matches": [ + { + "g": "com.github.mwiede", + "a": "jsch", + "v": "2.27.7" + } + ], + "note": "verified directly against repo1.maven.org .jar.sha1; absent from the Central search checksum index" + }, + { + "path": "server/lib/joda-time-2.9.9.jar", + "sha1": "f7b520c458572890807d143670c9b24f4de90897", + "size": 634048, + "status": "exact", + "matches": [ + { + "g": "joda-time", + "a": "joda-time", + "v": "2.9.9" + } + ] + }, + { + "path": "server/lib/log4j/log4j-1.2-api-2.25.3.jar", + "sha1": "a7e550e638a5e534fd944616c5ae665a67e9501e", + "size": 359213, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-1.2-api", + "v": "2.25.3" + } + ] + }, + { + "path": "server/lib/log4j/log4j-api-2.25.3.jar", + "sha1": "fb385330d89c2d61058ef649403f214633569205", + "size": 350610, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-api", + "v": "2.25.3" + } + ] + }, + { + "path": "server/lib/log4j/log4j-core-2.25.3.jar", + "sha1": "dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea", + "size": 2018402, + "status": "exact", + "matches": [ + { + "g": "org.apache.logging.log4j", + "a": "log4j-core", + "v": "2.25.3" + } + ] + }, + { + "path": "server/lib/mirth-vocab.jar", + "sha1": "ec29b1f3dd1403953533effd9ac24dc40c083eed", + "size": 5019845, + "status": "none", + "reason": "in-house artifact, built by the generator module (:generator:vocabJar)" + }, + { + "path": "server/lib/mybatis-3.1.1.jar", + "sha1": "8a9f355255ae72fc50009a7a2885313188b94037", + "size": 651643, + "status": "exact", + "matches": [ + { + "g": "org.mybatis", + "a": "mybatis", + "v": "3.1.1" + } + ] + }, + { + "path": "server/lib/not-going-to-be-commons-ssl-0.3.18.jar", + "sha1": "c6a5fa303ab82dcafe142842d9cb4b31c71e8861", + "size": 189337, + "status": "none", + "reason": "locally modified: 2 class files differ vs Central com.narupley:not-going-to-be-commons-ssl:0.3.18 (verified entry by entry). Must stay vendored; treat as a fork when considering upgrades." + }, + { + "path": "server/lib/quartz-2.3.2.jar", + "sha1": "18a6d6b5a40b77bd060b34cb9f2acadc4bae7c8a", + "size": 693050, + "status": "exact", + "matches": [ + { + "g": "org.quartz-scheduler", + "a": "quartz", + "v": "2.3.2" + } + ] + }, + { + "path": "server/lib/oshi-core-3.9.1.jar", + "sha1": "81a5b5f248d7f733fb1e15e63ebaf9c9c6d990ca", + "size": 441294, + "status": "exact", + "matches": [ + { + "g": "com.github.oshi", + "a": "oshi-core", + "v": "3.9.1" + } + ] + }, + { + "path": "server/lib/rhino-1.7.13.jar", + "sha1": "e6b2e12dc79fbdc58d8bf62a583705a551ec37d6", + "size": 1315838, + "status": "exact", + "matches": [ + { + "g": "org.mozilla", + "a": "rhino", + "v": "1.7.13" + } + ] + }, + { + "path": "server/lib/staxon-1.3.jar", + "sha1": "9cec6f1c1a05eeebb0b83b3e909fd4b496ddde44", + "size": 150272, + "status": "exact", + "matches": [ + { + "g": "de.odysseus.staxon", + "a": "staxon", + "v": "1.3" + } + ] + }, + { + "path": "server/lib/swagger/ext/reflections-0.9.10.jar", + "sha1": "c7f4ea230aedc757ca1499ebcfb2953c81cf8b67", + "size": 129763, + "status": "exact", + "matches": [ + { + "g": "org.reflections", + "a": "reflections", + "v": "0.9.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-annotations-2.0.10.jar", + "sha1": "85428dac7402fdca267219b76af644c21246b6bd", + "size": 34730, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-annotations", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-core-2.0.10.jar", + "sha1": "1948d49413f0a0718b6bbe0a0b56341a80e00486", + "size": 163608, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-core", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-integration-2.0.10.jar", + "sha1": "d8c53732e74d543678f7d66d13e3ea5b62c590de", + "size": 30502, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-integration", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-models-2.0.10.jar", + "sha1": "81655033c66bae2b78a5972f3a15a9cf4b65db58", + "size": 118276, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-models", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-jaxrs2-servlet-initializer-2.0.10.jar", + "sha1": "7289acc931dec910feadbca249a4b4159ad2e697", + "size": 31271, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-jaxrs2-servlet-initializer", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/swagger/swagger-jaxrs2-2.0.10.jar", + "sha1": "df57a58a1b6d2ab68cbe658b6cd3252f2a6a6f3a", + "size": 82006, + "status": "exact", + "matches": [ + { + "g": "io.swagger.core.v3", + "a": "swagger-jaxrs2", + "v": "2.0.10" + } + ] + }, + { + "path": "server/lib/velocity-engine-core-2.3.jar", + "sha1": "e2133b723d0e42be74880d34de6bf6538ea7f915", + "size": 531308, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity", + "a": "velocity-engine-core", + "v": "2.3" + } + ] + }, + { + "path": "server/lib/velocity-tools-generic-3.1.jar", + "sha1": "07aaa49086a64cd9dab967a8437cc03abbfad655", + "size": 216933, + "status": "exact", + "matches": [ + { + "g": "org.apache.velocity.tools", + "a": "velocity-tools-generic", + "v": "3.1" + } + ] + }, + { + "path": "server/lib/xpp3-1.1.4c.jar", + "sha1": "9b988ea84b9e4e9f1874e390ce099b8ac12cfff5", + "size": 120069, + "status": "exact", + "matches": [ + { + "g": "xpp3", + "a": "xpp3", + "v": "1.1.4c" + } + ] + }, + { + "path": "server/lib/xstream-1.4.20.jar", + "sha1": "0e2315b8b2e95e9f21697833c8e56cdd9c98a5ee", + "size": 644649, + "status": "exact", + "matches": [ + { + "g": "com.thoughtworks.xstream", + "a": "xstream", + "v": "1.4.20" + } + ] + }, + { + "path": "server/lib/zip4j_1.3.3.jar", + "sha1": "7791ee6d23da90c010fb9993dde3f124ba0f750c", + "size": 123998, + "status": "none", + "reason": "locally modified: 60 class files differ vs Central net.lingala.zip4j:zip4j:1.3.3 (verified entry by entry). Must stay vendored; treat as a fork when considering upgrades." + }, + { + "path": "server/testlib/byte-buddy-agent-1.14.13.jar", + "sha1": "979ce25f7d3096a2e82214ba7dc972a05ce7a171", + "size": 256811, + "status": "exact", + "matches": [ + { + "g": "net.bytebuddy", + "a": "byte-buddy-agent", + "v": "1.14.13" + } + ] + }, + { + "path": "server/testlib/hamcrest-2.2.jar", + "sha1": "1820c0968dba3a11a1b30669bb1f01978a91dedc", + "size": 123360, + "status": "exact", + "matches": [ + { + "g": "org.hamcrest", + "a": "hamcrest", + "v": "2.2" + } + ] + }, + { + "path": "server/testlib/junit-4.13.1.jar", + "sha1": "cdd00374f1fee76b11e2a9d127405aa3f6be5b6a", + "size": 382708, + "status": "exact", + "matches": [ + { + "g": "junit", + "a": "junit", + "v": "4.13.1" + } + ] + }, + { + "path": "server/testlib/byte-buddy-1.14.13.jar", + "sha1": "45cf516d9a23485200950549ff72b204c307fc9d", + "size": 4212903, + "status": "exact", + "matches": [ + { + "g": "net.bytebuddy", + "a": "byte-buddy", + "v": "1.14.13" + } + ] + }, + { + "path": "server/testlib/objenesis-2.5.1.jar", + "sha1": "272bab9a4e5994757044d1fc43ce480c8cb907a4", + "size": 54391, + "status": "exact", + "matches": [ + { + "g": "org.objenesis", + "a": "objenesis", + "v": "2.5.1" + } + ] + }, + { + "path": "server/testlib/mockito-core-5.1.1.jar", + "sha1": "31fd75d9d80e678032e5dc1bad17386f192853ea", + "size": 685421, + "status": "exact", + "matches": [ + { + "g": "org.mockito", + "a": "mockito-core", + "v": "5.1.1" + } + ] + }, + { + "path": "server/testlib/mockito-inline-5.1.1.jar", + "sha1": "3d1dffee9a8a1998ec782383ca2f818848f2d5f1", + "size": 1501, + "status": "exact", + "matches": [ + { + "g": "org.mockito", + "a": "mockito-inline", + "v": "5.2.0" + }, + { + "g": "org.mockito", + "a": "mockito-inline", + "v": "5.1.1" + }, + { + "g": "org.mockito", + "a": "mockito-inline", + "v": "5.1.0" + } + ] + } +] \ No newline at end of file diff --git a/tools/build-parity/sweep_provenance.py b/tools/build-parity/sweep_provenance.py new file mode 100644 index 0000000000..1d39d2d4b1 --- /dev/null +++ b/tools/build-parity/sweep_provenance.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 +"""Re-verify and classify the vendored-jar provenance record. + +Modes: + --verify-exact re-check every 'exact' entry: download the .jar.sha1 for + the recorded coordinate from repo1.maven.org and compare + to the recorded SHA-1 (catches tampering and typos). + --classify-none probe Maven Central for each 'none' entry by artifact + name and record evidence of WHY it stays vendored: + version never published, or published bytes differ. + +Lesson encoded here (June 2026 migration): Maven Central's search index +lacks checksum documents for some artifacts, so a "no SHA match" from the +search API is only trustworthy after a direct repo1 probe. +""" +import hashlib, json, os, re, subprocess, sys, time, urllib.parse + +HERE = os.path.dirname(os.path.abspath(__file__)) +REPO = os.path.dirname(os.path.dirname(HERE)) +PROV = os.path.join(HERE, 'jar-provenance.json') + +def curl(url): + r = subprocess.run(['curl', '-sL', '--max-time', '20', '-w', '\\n%{http_code}', url], + capture_output=True, text=True) + body, _, code = r.stdout.rpartition('\n') + return code, body + +def repo1_sha1(g, a, v, classifier=None): + path = f"{g.replace('.', '/')}/{a}/{v}/{a}-{v}{'-' + classifier if classifier else ''}.jar.sha1" + code, body = curl(f'https://repo1.maven.org/maven2/{path}') + # legacy .sha1 files contain "hash original/build/path"; the hash is the first token + return body.split()[0] if code == '200' and body.strip() else None + +def search_versions(artifact): + q = urllib.parse.quote(f'a:"{artifact}"') + code, body = curl(f'https://search.maven.org/solrsearch/select?q={q}&core=gav&rows=50&wt=json') + if code != '200': + return [] + try: + docs = json.loads(body)['response']['docs'] + return [(d['g'], d['a'], d['v']) for d in docs] + except Exception: + return [] + +def split_name(filename): + base = filename[:-4] + m = re.match(r'^(.*?)[-_](\d[\w.\-]*)$', base) + return (m.group(1), m.group(2)) if m else (base, None) + +def main(): + prov = json.load(open(PROV)) + changed = False + if '--verify-exact' in sys.argv: + bad = 0 + for e in prov: + if e['status'] != 'exact': + continue + m = e['matches'][0] + classifier = None + if 'netty-transport-native-epoll' in e['path']: + classifier = 'linux-x86_64' + actual = repo1_sha1(m['g'], m['a'], m['v'], classifier) + if actual != e['sha1']: + bad += 1 + print(f"MISMATCH {e['path']}: repo1={actual} recorded={e['sha1']}") + time.sleep(0.1) + print(f'verify-exact: {bad} mismatches') + sys.exit(1 if bad else 0) + if '--classify-none' in sys.argv: + for e in prov: + if e['status'] != 'none' or e.get('reason'): + continue + name = e['path'].rsplit('/', 1)[-1] + artifact, version = split_name(name) + gavs = search_versions(artifact) + same_version = [(g, a, v) for (g, a, v) in gavs if v == version] + if same_version: + g, a, v = same_version[0] + actual = repo1_sha1(g, a, v) + if actual == e['sha1']: + e['reason'] = f'MATCHES {g}:{a}:{v} on repo1; reclassify as exact' + else: + e['reason'] = (f'bytes differ from Central {g}:{a}:{v} ' + f'(repo1 sha1 {actual}); kept vendored') + elif gavs: + vs = sorted({v for (_, _, v) in gavs})[-5:] + e['reason'] = (f'version {version} never published to Central ' + f'(artifact exists; recent versions: {", ".join(vs)})') + else: + e['reason'] = 'no artifact of this name on Maven Central' + print(f"{e['path']}: {e['reason']}") + changed = True + time.sleep(0.2) + if changed: + json.dump(prov, open(PROV, 'w'), indent=1) + print('jar-provenance.json updated') + +main() diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index cd66e4145c..9449167a0b 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -1,6 +1,6 @@ - +