You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2019/10/31 14:36:26 UTC
[ws-wss4j] annotated tag 1_6_0-alpha created (now a42ff08)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git.
at a42ff08 (tag)
tagging d3d2069dc0bbf8315d6a5b92c5f8c166b822f0cd (commit)
by Colm O hEigeartaigh
on Fri Feb 11 11:36:29 2011 +0000
- Log -----------------------------------------------------------------
Merging to tag.
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 34e0c5d Tagging 1.6.0-alpha release.
new 82b94a0 Updating version numbers.
new 7f2d1e1 Fixing bug in release script.
new 7c29874 JDK 1.5.x compilation fixes.
new d3d2069 Merging to tag.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ws-wss4j] 04/05: JDK 1.5.x compilation fixes.
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 7c2987443a1effc2b11a1f8af3bae61e52a15107
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 10 18:11:28 2011 +0000
JDK 1.5.x compilation fixes.
---
src/main/java/org/apache/ws/security/message/token/Reference.java | 2 +-
.../apache/ws/security/message/token/SecurityTokenReference.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/ws/security/message/token/Reference.java b/src/main/java/org/apache/ws/security/message/token/Reference.java
index 55a7f66..d44312f 100644
--- a/src/main/java/org/apache/ws/security/message/token/Reference.java
+++ b/src/main/java/org/apache/ws/security/message/token/Reference.java
@@ -58,7 +58,7 @@ public class Reference {
String uri = getURI();
// Reference URI cannot be null or empty
- if (uri == null || uri.isEmpty()) {
+ if (uri == null || "".equals(uri)) {
throw new WSSecurityException(
WSSecurityException.INVALID_SECURITY, "badReferenceURI"
);
diff --git a/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java b/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
index 4d3b4ed..b1b8ff8 100644
--- a/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
+++ b/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
@@ -786,14 +786,14 @@ public class SecurityTokenReference {
String valueType = getKeyIdentifierValueType();
// ValueType cannot be null
- if (valueType == null || valueType.isEmpty()) {
+ if (valueType == null || "".equals(valueType)) {
throw new WSSecurityException(
WSSecurityException.INVALID_SECURITY, "invalidValueType"
);
}
String encodingType = getFirstElement().getAttribute("EncodingType");
// Encoding Type must be equal to Base64Binary if it's specified
- if (encodingType != null && !encodingType.isEmpty()
+ if (encodingType != null && !"".equals(encodingType)
&& !BinarySecurity.BASE64_ENCODING.equals(encodingType)) {
throw new WSSecurityException(
WSSecurityException.INVALID_SECURITY,
@@ -804,7 +804,7 @@ public class SecurityTokenReference {
// Encoding type must be specified other than for a SAML Assertion
if (!WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(valueType)
&& !WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(valueType)
- && (encodingType == null || encodingType.isEmpty())) {
+ && (encodingType == null || "".equals(encodingType))) {
throw new WSSecurityException(
WSSecurityException.INVALID_SECURITY, "noEncodingType"
);
[ws-wss4j] 03/05: Fixing bug in release script.
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 7f2d1e11f7c3c03d60576b85a0a4429192e221ce
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 10 17:23:46 2011 +0000
Fixing bug in release script.
---
contrib/wss4j-release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/wss4j-release.sh b/contrib/wss4j-release.sh
index 29f622f..6f7f8ff 100755
--- a/contrib/wss4j-release.sh
+++ b/contrib/wss4j-release.sh
@@ -64,7 +64,7 @@ cp -r ${M2_REPO}/org/apache/ws/security/wss4j/${WSS4J_VERSION} ${WSS4J_STAGE_ROO
# gpg --detach-sign --armor $i
# gpg --verify $i.asc
#done
-for i in *.jar *.zip
+#for i in *.jar *.zip
#do
# md5sum $i > $i.md5
#done
[ws-wss4j] 01/05: Tagging 1.6.0-alpha release.
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 34e0c5d8493b3a989857a6c50e565f936d6c4fc3
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 10 17:04:58 2011 +0000
Tagging 1.6.0-alpha release.
[ws-wss4j] 02/05: Updating version numbers.
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 82b94a07205ad5fa6bb21cfaac5949b25895331f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 10 17:14:09 2011 +0000
Updating version numbers.
---
build.xml | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 7dad1d7..9dda8bd 100644
--- a/build.xml
+++ b/build.xml
@@ -27,8 +27,8 @@ Build Instructions:
<property name='product.version.major' value='1'/>
<property name='product.version.minor' value='6'/>
- <!--<property name='product.version.level' value='0'/>-->
- <property name='product.version.qualifier' value='-SNAPSHOT'/>
+ <property name='product.version.level' value='0'/>
+ <property name='product.version.qualifier' value='-alpha'/>
<property name='product.version' value='${product.version.major}.${product.version.minor}${product.version.qualifier}'/>
<property name="year" value="2010"/>
<property name="copyright" value="Copyright © ${year} Apache WSS4J Project. All Rights Reserved."/>
diff --git a/pom.xml b/pom.xml
index fb39ef6..0341e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<artifactId>wss4j</artifactId>
<packaging>bundle</packaging>
<name>WSS4J</name>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6.0-alpha</version>
<description>
Apache WSS4J is an implementation of the Web Services Security
(WS-Security) being developed at OASIS Web Services Security TC.
[ws-wss4j] 05/05: Merging to tag.
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to annotated tag 1_6_0-alpha
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit d3d2069dc0bbf8315d6a5b92c5f8c166b822f0cd
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Feb 11 11:36:29 2011 +0000
Merging to tag.
---
.../org/apache/ws/security/handler/WSHandler.java | 29 +++++++++++++---------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/ws/security/handler/WSHandler.java b/src/main/java/org/apache/ws/security/handler/WSHandler.java
index ca8580d..04d2a89 100644
--- a/src/main/java/org/apache/ws/security/handler/WSHandler.java
+++ b/src/main/java/org/apache/ws/security/handler/WSHandler.java
@@ -433,10 +433,7 @@ public abstract class WSHandler {
if (sigPropFile != null) {
crypto = (Crypto) cryptos.get(sigPropFile);
if (crypto == null) {
- crypto =
- CryptoFactory.getInstance(
- sigPropFile, this.getClassLoader(reqData.getMsgContext())
- );
+ crypto = loadCryptoFromPropertiesFile(sigPropFile, reqData);
cryptos.put(sigPropFile, crypto);
}
} else if (getString(WSHandlerConstants.SIG_PROP_REF_ID, reqData.getMsgContext()) != null) {
@@ -459,6 +456,20 @@ public abstract class WSHandler {
return crypto;
}
+
+ /**
+ * A hook to allow subclass to load Crypto instances from property files in a different
+ * way.
+ * @param propFilename The property file name
+ * @param reqData The RequestData object
+ * @return A Crypto instance that has been loaded
+ */
+ protected Crypto loadCryptoFromPropertiesFile(String propFilename, RequestData reqData) {
+ return
+ CryptoFactory.getInstance(
+ propFilename, this.getClassLoader(reqData.getMsgContext())
+ );
+ }
/**
* Hook to allow subclasses to load their Encryption Crypto however they
@@ -476,10 +487,7 @@ public abstract class WSHandler {
if (encPropFile != null) {
crypto = (Crypto) cryptos.get(encPropFile);
if (crypto == null) {
- crypto =
- CryptoFactory.getInstance(
- encPropFile, this.getClassLoader(reqData.getMsgContext())
- );
+ crypto = loadCryptoFromPropertiesFile(encPropFile, reqData);
cryptos.put(encPropFile, crypto);
}
} else if (getString(WSHandlerConstants.ENC_PROP_REF_ID, reqData.getMsgContext()) != null) {
@@ -995,10 +1003,7 @@ public abstract class WSHandler {
if (decPropFile != null) {
crypto = (Crypto) cryptos.get(decPropFile);
if (crypto == null) {
- crypto =
- CryptoFactory.getInstance(
- decPropFile, this.getClassLoader(reqData.getMsgContext())
- );
+ crypto = loadCryptoFromPropertiesFile(decPropFile, reqData);
cryptos.put(decPropFile, crypto);
}
} else if (getString(WSHandlerConstants.DEC_PROP_REF_ID, reqData.getMsgContext()) != null) {