[jbossws-commits] JBossWS SVN: r11007 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch01: modules/core and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2009-10-23 12:53:59 -0400 (Fri, 23 Oct 2009)
New Revision: 11007

Modified:
   stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml
   stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
   stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml
   stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml
Log:
Applied patched for patch01

Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml	2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml	2009-10-23 16:53:59 UTC (rev 11007)
@@ -47,13 +47,15 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-ejb-api</artifactId>
+      <version>5.0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.jms</groupId>
-      <artifactId>jms</artifactId>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-jms-api</artifactId>
+      <version>5.0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java	2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java	2009-10-23 16:53:59 UTC (rev 11007)
@@ -92,6 +92,7 @@
       try
       {
          cipher = XMLCipher.getInstance();
+         cipher.init(XMLCipher.DECRYPT_MODE, null);
          key = cipher.loadEncryptedKey(element);
       }
       catch (XMLSecurityException e)

Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml	2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml	2009-10-23 16:53:59 UTC (rev 11007)
@@ -24,6 +24,11 @@
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.stream</groupId>
+      <artifactId>jsr173_api</artifactId>
+      <version>2.1</version>
+    </dependency>
   </dependencies>
   
 </project>

Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml	2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml	2009-10-23 16:53:59 UTC (rev 11007)
@@ -72,7 +72,7 @@
     <sun.jaxws.version>2.1.3</sun.jaxws.version>
     <woodstox.version>3.2.6</woodstox.version>
     <wsdl4j.version>1.6.1</wsdl4j.version>
-    <xmlsec.version>1.4.2</xmlsec.version>
+    <xmlsec.version>1.4.3</xmlsec.version>
     <xalan.version>2.7.0</xalan.version>
     <xerces.version>2.8.1</xerces.version>
   </properties>
@@ -147,6 +147,11 @@
         <version>1.4</version>
       </dependency>
       <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>jsr173_api</artifactId>
+        <version>2.1</version>
+      </dependency>
+      <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.5</version>
@@ -233,6 +238,52 @@
         <artifactId>juddi-service</artifactId>
         <version>${jboss.jaxr.version}</version>
         <type>sar</type>
+        <exclusions>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-jmx</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-system-jmx</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-common</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-j2se</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss</groupId>
+             <artifactId>jboss-system</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>org.jboss.microcontainer</groupId>
+             <artifactId>jboss-microcontainer</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss.jbossws</groupId>
+             <artifactId>jboss-jaxrpc</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>jboss.jbossws</groupId>
+             <artifactId>jboss-saaj</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>apache-scout</groupId>
+             <artifactId>scout</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>juddi</groupId>
+             <artifactId>juddi</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>apache-scout</groupId>