From 190a241a255337458506c55436dbc6f3f1f9d172 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 5 Jun 2018 20:19:10 -0400 Subject: [PATCH] Java relocation. --- gradle/settings.gradle | 2 +- platform-independent/c/core/build.gradle | 6 +++--- platform-independent/java/{core => }/algorithm/build.gradle | 0 .../main/java/com/lyndir/masterpassword/MPAlgorithm.java | 0 .../com/lyndir/masterpassword/MPAlgorithmException.java | 0 .../main/java/com/lyndir/masterpassword/MPException.java | 0 .../main/java/com/lyndir/masterpassword/MPIdenticon.java | 0 .../main/java/com/lyndir/masterpassword/MPKeyPurpose.java | 0 .../lyndir/masterpassword/MPKeyUnavailableException.java | 0 .../main/java/com/lyndir/masterpassword/MPMasterKey.java | 0 .../main/java/com/lyndir/masterpassword/MPResultType.java | 0 .../java/com/lyndir/masterpassword/MPResultTypeClass.java | 0 .../main/java/com/lyndir/masterpassword/MPSiteFeature.java | 0 .../src/main/java/com/lyndir/masterpassword/MPTemplate.java | 0 .../com/lyndir/masterpassword/MPTemplateCharacterClass.java | 0 .../java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java | 0 .../java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java | 0 .../java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java | 0 .../java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java | 0 .../main/java/com/lyndir/masterpassword/impl/Native.java | 0 .../java/com/lyndir/masterpassword/impl/package-info.java | 0 .../main/java/com/lyndir/masterpassword/package-info.java | 0 .../java/core/tests/src/main/resources/mpw_tests.xml | 1 - platform-independent/java/{core => }/model/build.gradle | 0 .../java/com/lyndir/masterpassword/model/MPConstant.java | 0 .../model/MPIncorrectMasterPasswordException.java | 0 .../java/com/lyndir/masterpassword/model/MPQuestion.java | 0 .../main/java/com/lyndir/masterpassword/model/MPSite.java | 0 .../java/com/lyndir/masterpassword/model/MPSiteResult.java | 0 .../main/java/com/lyndir/masterpassword/model/MPUser.java | 0 .../java/com/lyndir/masterpassword/model/MPUserManager.java | 0 .../lyndir/masterpassword/model/impl/MPBasicQuestion.java | 0 .../com/lyndir/masterpassword/model/impl/MPBasicSite.java | 0 .../com/lyndir/masterpassword/model/impl/MPBasicUser.java | 0 .../lyndir/masterpassword/model/impl/MPFileQuestion.java | 0 .../com/lyndir/masterpassword/model/impl/MPFileSite.java | 0 .../com/lyndir/masterpassword/model/impl/MPFileUser.java | 0 .../lyndir/masterpassword/model/impl/MPFileUserManager.java | 0 .../lyndir/masterpassword/model/impl/MPFlatMarshaller.java | 0 .../masterpassword/model/impl/MPFlatUnmarshaller.java | 0 .../lyndir/masterpassword/model/impl/MPJSONAnyObject.java | 0 .../com/lyndir/masterpassword/model/impl/MPJSONFile.java | 0 .../lyndir/masterpassword/model/impl/MPJSONMarshaller.java | 0 .../masterpassword/model/impl/MPJSONUnmarshaller.java | 0 .../masterpassword/model/impl/MPMarshalException.java | 0 .../lyndir/masterpassword/model/impl/MPMarshalFormat.java | 0 .../com/lyndir/masterpassword/model/impl/MPMarshaller.java | 0 .../lyndir/masterpassword/model/impl/MPUnmarshaller.java | 0 .../com/lyndir/masterpassword/model/impl/package-info.java | 0 .../java/com/lyndir/masterpassword/model/package-info.java | 0 platform-independent/java/{core => }/tests/build.gradle | 0 .../main/java/com/lyndir/masterpassword/MPTestSuite.java | 0 .../src/main/java/com/lyndir/masterpassword/MPTests.java | 0 .../java/tests/src/main/resources/mpw_tests.xml | 1 + .../{core => }/tests/src/main/resources/test.mpsites.json | 0 .../java/com/lyndir/masterpassword/MPMasterKeyTest.java | 0 .../java/{core => }/tests/src/test/resources/logback.xml | 0 57 files changed, 5 insertions(+), 5 deletions(-) rename platform-independent/java/{core => }/algorithm/build.gradle (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java (100%) rename platform-independent/java/{core => }/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java (100%) delete mode 120000 platform-independent/java/core/tests/src/main/resources/mpw_tests.xml rename platform-independent/java/{core => }/model/build.gradle (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java (100%) rename platform-independent/java/{core => }/model/src/main/java/com/lyndir/masterpassword/model/package-info.java (100%) rename platform-independent/java/{core => }/tests/build.gradle (100%) rename platform-independent/java/{core => }/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java (100%) rename platform-independent/java/{core => }/tests/src/main/java/com/lyndir/masterpassword/MPTests.java (100%) create mode 120000 platform-independent/java/tests/src/main/resources/mpw_tests.xml rename platform-independent/java/{core => }/tests/src/main/resources/test.mpsites.json (100%) rename platform-independent/java/{core => }/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java (100%) rename platform-independent/java/{core => }/tests/src/test/resources/logback.xml (100%) diff --git a/gradle/settings.gradle b/gradle/settings.gradle index 425cc7b6..0af73456 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -10,7 +10,7 @@ include 'masterpassword-core' project(':masterpassword-core').projectDir = new File( '../platform-independent/c/core' ) include 'masterpassword-algorithm' -project(':masterpassword-algorithm').projectDir = new File( '../platform-independent/java/core' ) +project(':masterpassword-algorithm').projectDir = new File( '../platform-independent/java/algorithm' ) include 'masterpassword-model' project(':masterpassword-model').projectDir = new File( '../platform-independent/java/model' ) diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle index baabdcd4..81f8b05a 100644 --- a/platform-independent/c/core/build.gradle +++ b/platform-independent/c/core/build.gradle @@ -52,11 +52,11 @@ library { add( includePathConfiguration.name, files( new File( Jvm.current().javaHome, "include" ) ) { first().eachDir { from it } } ) - // Depend on libsodium from `lib`; run `lib/bin/build_libsodium-${os}` first. + // Depend on libsodium from `lib`; run `lib/bin/build_libsodium-${platform}` first. add( includePathConfiguration.name, - files( "../../lib/libsodium/build-${platform}~/out/include" ) ) + files( "../../../lib/libsodium/build-${platform}~/out/include" ) ) add( linkLibraries.name, - fileTree( "../../lib/libsodium/build-${platform}~/out/lib" ) ) + fileTree( "../../../lib/libsodium/build-${platform}~/out/lib" ) ) } } } diff --git a/platform-independent/java/core/algorithm/build.gradle b/platform-independent/java/algorithm/build.gradle similarity index 100% rename from platform-independent/java/core/algorithm/build.gradle rename to platform-independent/java/algorithm/build.gradle diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java diff --git a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java similarity index 100% rename from platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java rename to platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java diff --git a/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml b/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml deleted file mode 120000 index 2e9edd37..00000000 --- a/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../c/cli/mpw_tests.xml \ No newline at end of file diff --git a/platform-independent/java/core/model/build.gradle b/platform-independent/java/model/build.gradle similarity index 100% rename from platform-independent/java/core/model/build.gradle rename to platform-independent/java/model/build.gradle diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java diff --git a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java b/platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java similarity index 100% rename from platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java rename to platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java diff --git a/platform-independent/java/core/tests/build.gradle b/platform-independent/java/tests/build.gradle similarity index 100% rename from platform-independent/java/core/tests/build.gradle rename to platform-independent/java/tests/build.gradle diff --git a/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java b/platform-independent/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java similarity index 100% rename from platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java rename to platform-independent/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java diff --git a/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java b/platform-independent/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java similarity index 100% rename from platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java rename to platform-independent/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java diff --git a/platform-independent/java/tests/src/main/resources/mpw_tests.xml b/platform-independent/java/tests/src/main/resources/mpw_tests.xml new file mode 120000 index 00000000..9e544649 --- /dev/null +++ b/platform-independent/java/tests/src/main/resources/mpw_tests.xml @@ -0,0 +1 @@ +../../../../../c/cli/mpw_tests.xml \ No newline at end of file diff --git a/platform-independent/java/core/tests/src/main/resources/test.mpsites.json b/platform-independent/java/tests/src/main/resources/test.mpsites.json similarity index 100% rename from platform-independent/java/core/tests/src/main/resources/test.mpsites.json rename to platform-independent/java/tests/src/main/resources/test.mpsites.json diff --git a/platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java b/platform-independent/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java similarity index 100% rename from platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java rename to platform-independent/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java diff --git a/platform-independent/java/core/tests/src/test/resources/logback.xml b/platform-independent/java/tests/src/test/resources/logback.xml similarity index 100% rename from platform-independent/java/core/tests/src/test/resources/logback.xml rename to platform-independent/java/tests/src/test/resources/logback.xml