Java relocation.

2018-06-05 20:19:10 -04:00 · 2018-06-05 20:19:10 -04:00 · 190a241a25
commit 190a241a25
parent aef8422102
57 changed files with 5 additions and 5 deletions
--- 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' )
--- 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" ) )
        }
    }
 }
--- a/platform-independent/java/core/algorithm/build.gradle
+++ b/platform-independent/java/core/algorithm/build.gradle
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java
--- a/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java
+++ b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java
--- a/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml
+++ b/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml
@ -1 +0,0 @@
 ../../../../../../c/cli/mpw_tests.xml
--- a/platform-independent/java/core/model/build.gradle
+++ b/platform-independent/java/core/model/build.gradle
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java
--- a/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java
+++ b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java
--- a/platform-independent/java/core/tests/build.gradle
+++ b/platform-independent/java/core/tests/build.gradle
--- a/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java
+++ b/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java
--- a/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java
+++ b/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java
--- a/platform-independent/java/tests/src/main/resources/mpw_tests.xml
+++ b/platform-independent/java/tests/src/main/resources/mpw_tests.xml
@ -0,0 +1 @@
 ../../../../../c/cli/mpw_tests.xml
--- a/platform-independent/java/core/tests/src/main/resources/test.mpsites.json
+++ b/platform-independent/java/core/tests/src/main/resources/test.mpsites.json
--- a/platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java
+++ b/platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java
--- a/platform-independent/java/core/tests/src/test/resources/logback.xml
+++ b/platform-independent/java/core/tests/src/test/resources/logback.xml