[jbossws-commits] JBossWS SVN: r9922 - in stack/native/trunk: modules/core and 3 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-04-29 14:01:05 -0400 (Wed, 29 Apr 2009)
New Revision: 9922

Modified:
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
   stack/native/trunk/pom.xml
   stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2618] Upgrade to xmlsec 1.4.2


Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml	2009-04-29 10:58:27 UTC (rev 9921)
+++ stack/native/trunk/modules/core/pom.xml	2009-04-29 18:01:05 UTC (rev 9922)
@@ -161,7 +161,7 @@
       <artifactId>wsdl4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>xml-security</groupId>
+      <groupId>org.apache</groupId>
       <artifactId>xmlsec</artifactId>
     </dependency>
     <dependency>

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java	2009-04-29 10:58:27 UTC (rev 9921)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java	2009-04-29 18:01:05 UTC (rev 9922)
@@ -48,7 +48,7 @@
 
    public static final String XML_ENCRYPTION_NS = EncryptionConstants.EncryptionSpecNS;
 
-   public static final String XML_ENCRYPTION_PREFIX = "xenc";
+   public static final String XML_ENCRYPTION_PREFIX = "ds"; //xmlsec 1.4.2 requires this to be "ds" to correctly create KeyInfo elements
 
    public static final String ID = "Id";
 

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java	2009-04-29 10:58:27 UTC (rev 9921)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java	2009-04-29 18:01:05 UTC (rev 9922)
@@ -170,6 +170,7 @@
       Element element = document.createElementNS(Constants.WSSE_NS, Constants.WSSE_HEADER);
       Util.addNamespace(element, Constants.WSSE_PREFIX, Constants.WSSE_NS);
       Util.addNamespace(element, Constants.WSU_PREFIX, Constants.WSU_NS);
+      Util.addNamespace(element, Constants.XML_ENCRYPTION_PREFIX, Constants.XML_SIGNATURE_NS);
 
       if (timestamp != null)
          element.appendChild(timestamp.getElement());

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2009-04-29 10:58:27 UTC (rev 9921)
+++ stack/native/trunk/pom.xml	2009-04-29 18:01:05 UTC (rev 9922)
@@ -76,7 +76,7 @@
     <woodstox.version>3.2.6</woodstox.version>
     <wscommons.policy.version>1.0</wscommons.policy.version>
     <wsdl4j.version>1.6.1</wsdl4j.version>
-    <xmlsec.version>1.3.0</xmlsec.version>
+    <xmlsec.version>1.4.2</xmlsec.version>
     <xalan.version>2.7.0</xalan.version>
     <xerces.version>2.8.1</xerces.version>
   </properties>
@@ -320,7 +320,7 @@
         <version>${xerces.version}</version>
       </dependency>
       <dependency>
-        <groupId>xml-security</groupId>
+        <groupId>org.apache</groupId>
         <artifactId>xmlsec</artifactId>
         <version>${xmlsec.version}</version>
       </dependency>

Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2009-04-29 10:58:27 UTC (rev 9921)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2009-04-29 18:01:05 UTC (rev 9922)
@@ -51,7 +51,7 @@
               <include>org.jvnet.staxex:stax-ex:jar</include>
               <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
               <include>wsdl4j:wsdl4j:jar</include>
-              <include>xml-security:xmlsec:jar</include>
+              <include>org.apache:xmlsec:jar</include>
             </includes>
           </dependencySet>
           <dependencySet>