You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/12/06 13:25:15 UTC
svn commit: r1210883 - in /webservices/wss4j/trunk: ./ lib/
src/main/java/org/apache/ws/security/
src/test/java/org/apache/ws/security/message/
Author: coheigea
Date: Tue Dec 6 12:25:14 2011
New Revision: 1210883
URL: http://svn.apache.org/viewvc?rev=1210883&view=rev
Log:
[WSS-325][WSS-326] - Upgrading to Santuario 1.5.0-SNAPSHOT again
Added:
webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar
Removed:
webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
Added: webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar?rev=1210883&view=auto
==============================================================================
Files webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar (added) and webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar Tue Dec 6 12:25:14 2011 differ
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1210883&r1=1210882&r2=1210883&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Tue Dec 6 12:25:14 2011
@@ -160,7 +160,7 @@
javax.xml.crypto.*,
org.apache.xml.security.*,
org.bouncycastle.*;resolution:=optional,
- org.jcp.xml.dsig.internal.dom.*,
+ org.apache.jcp.xml.dsig.internal.dom.*,
org.opensaml.*;resolution:=optional,
*;resolution:=optional
</Import-Package>
@@ -353,7 +353,7 @@
</profiles>
<properties>
- <xmlsec.version>1.4.6</xmlsec.version>
+ <xmlsec.version>1.5.0-SNAPSHOT</xmlsec.version>
<opensaml.version>2.5.1-1</opensaml.version>
<xml.apis.version>1.3.04</xml.apis.version>
<bcprov.version>1.46</bcprov.version>
@@ -552,4 +552,19 @@
</site>
</distributionManagement>
+ <!-- Temporarily adding in to get Santuario SNAPSHOT -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java?rev=1210883&r1=1210882&r2=1210883&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java Tue Dec 6 12:25:14 2011
@@ -30,13 +30,13 @@ import java.util.Map;
import javax.xml.namespace.QName;
+import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.ws.security.action.Action;
import org.apache.ws.security.processor.Processor;
import org.apache.ws.security.util.Loader;
import org.apache.ws.security.util.UUIDGenerator;
import org.apache.ws.security.validate.Validator;
import org.apache.xml.security.utils.XMLUtils;
-import org.jcp.xml.dsig.internal.dom.XMLDSigRI;
/**
* WSSConfig <p/> Carries configuration data so the WSS4J spec compliance can be
@@ -426,7 +426,7 @@ public class WSSConfig {
}
public static void addXMLDSigRIInternal() {
- addJceProvider("XMLDSig", new XMLDSigRI());
+ addJceProvider("ApacheXMLDSig", new XMLDSigRI());
}
/**
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java?rev=1210883&r1=1210882&r2=1210883&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java Tue Dec 6 12:25:14 2011
@@ -66,7 +66,6 @@ public class EncryptionGCMTest extends o
}
@org.junit.Test
- @org.junit.Ignore
public void testAES128GCM() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
@@ -88,7 +87,6 @@ public class EncryptionGCMTest extends o
}
@org.junit.Test
- @org.junit.Ignore
public void testAES256GCM() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java?rev=1210883&r1=1210882&r2=1210883&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java Tue Dec 6 12:25:14 2011
@@ -36,6 +36,7 @@ import org.apache.ws.security.saml.ext.S
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.util.XmlSchemaDateFormat;
+import org.apache.xml.security.utils.IdResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -172,6 +173,9 @@ public class ModifiedRequestTest extends
((org.w3c.dom.Element)valueNode).setAttributeNS(
WSConstants.WSU_NS, "wsu:Id", "id-250"
);
+
+ // Clear the Santuario IdResolver cache
+ IdResolver.unregisterDocument(signedDoc);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -316,10 +320,8 @@ public class ModifiedRequestTest extends
/**
* Test for when an EncryptedData structure is modified
- * TODO Re-enable this test once Santuario 1.4.6 is released.
*/
@org.junit.Test
- @org.junit.Ignore
public void testModifiedEncryptedDataStructure() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");