11:55 a.m.
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 12:55:15 -0400 (Fri, 23 Oct 2009)
New Revision: 11008
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml
Log:
Applied patches for patch-02
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml 2009-10-23
16:53:59 UTC (rev 11007)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml 2009-10-23
16:55:15 UTC (rev 11008)
@@ -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-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-10-23
16:53:59 UTC (rev 11007)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-10-23
16:55:15 UTC (rev 11008)
@@ -24,6 +24,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import javax.xml.ws.handler.MessageContext;
@@ -127,7 +128,7 @@
{
super.setOperationMetaData(opMetaData);
- // [JBWS-2031] Implement standard message context properties
+ // [JBWS-2013] Implement standard message context properties
if (opMetaData != null)
{
EndpointMetaData epMetaData = opMetaData.getEndpointMetaData();
@@ -138,14 +139,11 @@
{
try
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, wsdlURL.openStream()); // [JBWS-2325] ensure file
descriptors are closed
- InputSource inputSource = new InputSource(new
ByteArrayInputStream(baos.toByteArray()));
- put(MessageContext.WSDL_DESCRIPTION, inputSource);
+ put(MessageContext.WSDL_DESCRIPTION, wsdlURL.toURI());
}
- catch (IOException ex)
+ catch (URISyntaxException e)
{
- throw new WSException("Cannot open: " + wsdlURL);
+ log.warn("Cannot get the wsdl url", e);
}
}
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23
16:53:59 UTC (rev 11007)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23
16:55:15 UTC (rev 11008)
@@ -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-patch-02/modules/jaxws/pom.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml 2009-10-23
16:53:59 UTC (rev 11007)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml 2009-10-23
16:55:15 UTC (rev 11008)
@@ -24,6 +24,11 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml 2009-10-23 16:53:59
UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml 2009-10-23 16:55:15
UTC (rev 11008)
@@ -56,25 +56,25 @@
<jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
+ <codehaus.jettison.version>1.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <javassist.version>3.6.0.GA</javassist.version>
- <jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.9</jaxb.impl.version>
+ <javassist.version>3.9.0.GA</javassist.version>
+ <jaxb.api.version>2.1.9.patch01</jaxb.api.version>
+ <jaxb.impl.version>2.1.9.patch01</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
- <jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version>
- <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
- <apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>0.9RC4</juddi.version>
- <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
+ <jboss.logging.version>2.1.0.GA</jboss.logging.version>
+ <jboss.remoting.version>2.5.1</jboss.remoting.version>
+ <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <apache.scout.version>1.1.1</apache.scout.version>
+ <juddi.version>2.0.1</juddi.version>
+ <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<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>
- <xalan.version>2.7.0</xalan.version>
- <xerces.version>2.8.1</xerces.version>
+ <woodstox.version>3.2.8</woodstox.version>
+ <wsdl4j.version>1.6.2</wsdl4j.version>
+ <xmlsec.version>1.4.3</xmlsec.version>
+ <xalan.version>2.7.1.patch02</xalan.version>
+ <xerces.version>2.9.1</xerces.version>
</properties>
<!-- DependencyManagement -->
@@ -147,6 +147,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</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>