You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2017/05/16 09:56:31 UTC
[1/2] deltaspike git commit: fix rat test.
Repository: deltaspike
Updated Branches:
refs/heads/master 842c84bd1 -> 0cdede08c
fix rat test.
Manifest files do not have comments :(
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b41476e5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b41476e5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b41476e5
Branch: refs/heads/master
Commit: b41476e5f0b48c1060b04c5904397df003720b79
Parents: 842c84b
Author: Mark Struberg <st...@apache.org>
Authored: Tue May 16 11:54:56 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue May 16 11:54:56 2017 +0200
----------------------------------------------------------------------
deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF | 1 +
deltaspike/pom.xml | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b41476e5/deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF b/deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF
index c8bdad5..d4d54ba 100644
--- a/deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF
+++ b/deltaspike/core/impl/src/main/resources/META-INF/MANIFEST.MF
@@ -1 +1,2 @@
Main-Class: org.apache.deltaspike.core.impl.crypto.CipherCli
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b41476e5/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index dd6835f..548d179 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -92,6 +92,7 @@
<exclude>target/**</exclude>
<exclude>test-ee7/target/**</exclude>
<exclude>**/*.iml</exclude>
+ <exclude>**/MANIFEST.MF</exclude>
</excludes>
</configuration>
</plugin>
[2/2] deltaspike git commit: DELTASPIKE-1250 only log out the
master.hash index key not the hash itself
Posted by st...@apache.org.
DELTASPIKE-1250 only log out the master.hash index key not the hash itself
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0cdede08
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0cdede08
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0cdede08
Branch: refs/heads/master
Commit: 0cdede08c07b0ed791b9018e1ea5281b690728ae
Parents: b41476e
Author: Mark Struberg <st...@apache.org>
Authored: Tue May 16 11:55:32 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue May 16 11:55:32 2017 +0200
----------------------------------------------------------------------
.../apache/deltaspike/core/impl/crypto/DefaultCipherService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0cdede08/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
index 8e5f293..6e01ea6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
@@ -67,7 +67,7 @@ public class DefaultCipherService
if (keys.get(saltKey) != null && !overwrite)
{
- throw new IllegalStateException("MasterKey for hash " + saltHash +
+ throw new IllegalStateException("MasterKey for hash " + saltKey +
" already exists. Forced overwrite option needed");
}
@@ -75,7 +75,7 @@ public class DefaultCipherService
keys.store(new FileOutputStream(masterFile), null);
- return saltHash;
+ return saltKey;
}
protected String getMasterKey(String masterSalt)