ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1208355 - in /webservices/wss4j/trunk: lib/xmlsec-1.4.6.jar lib/xmlsec-1.5.0-SNAPSHOT.jar pom.xml src/main/java/org/apache/ws/security/WSSConfig.java
Date Wed, 30 Nov 2011 10:01:17 GMT
Author: coheigea
Date: Wed Nov 30 10:01:15 2011
New Revision: 1208355

URL: http://svn.apache.org/viewvc?rev=1208355&view=rev
Log:
[WSS-326] - Downgrading from Santuario 1.5.0 to 1.4.6

Added:
    webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar
Removed:
    webservices/wss4j/trunk/lib/xmlsec-1.5.0-SNAPSHOT.jar
Modified:
    webservices/wss4j/trunk/pom.xml
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java

Added: webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar?rev=1208355&view=auto
==============================================================================
Files webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar (added) and webservices/wss4j/trunk/lib/xmlsec-1.4.6.jar
Wed Nov 30 10:01:15 2011 differ

Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1208355&r1=1208354&r2=1208355&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Wed Nov 30 10:01:15 2011
@@ -353,7 +353,7 @@
     </profiles>
 
     <properties>
-        <xmlsec.version>1.5.0-SNAPSHOT</xmlsec.version>
+        <xmlsec.version>1.4.6</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,19 +552,4 @@
         </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=1208355&r1=1208354&r2=1208355&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 Wed Nov 30
10:01:15 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
@@ -401,7 +401,7 @@ public class WSSConfig {
             if (addJceProviders) {
                 AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
                     public Boolean run() {
-                        addJceProvider("ApacheXMLDSig", new XMLDSigRI());
+                        addXMLDSigRI();
                         addJceProvider("BC", "org.bouncycastle.jce.provider.BouncyCastleProvider");
                         Security.removeProvider("STRTransform");
                         appendJceProvider(
@@ -416,6 +416,19 @@ public class WSSConfig {
         }
     }
     
+    private static void addXMLDSigRI() {
+        try {
+            addXMLDSigRIInternal();
+        } catch (Throwable t) {
+            //ignore - may be a NoClassDefFound if XMLDSigRI isn't avail
+            return;
+        }
+    }
+    
+    public static void addXMLDSigRIInternal() {
+        addJceProvider("XMLDSig", new XMLDSigRI());
+    }
+
     /**
      * @return a new WSSConfig instance configured with the default values
      */



Mime
View raw message