JBossWS SVN: r17037 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP13: modules/client and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-26 04:48:15 -0500 (Mon, 26 Nov 2012)
New Revision: 17037
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/endorsed/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/management/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/framework-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/pom.xml
Log:
[JBPAPP-9495] fixing tag version
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/client/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/client/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/endorsed/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/endorsed/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/management/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/management/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/management/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/resources/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/resources/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/cxf-tests/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/cxf-tests/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/framework-tests/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/framework-tests/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/testsuite/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/pom.xml 2012-11-26 09:45:39 UTC (rev 17036)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
@@ -17,7 +17,7 @@
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
- <version>3.1.2.SP12</version>
+ <version>3.1.2.SP13</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.1.2...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.1.2...</url>
</scm>
<!-- Modules -->
12 years
JBossWS SVN: r17036 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP13: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-26 04:45:39 -0500 (Mon, 26 Nov 2012)
New Revision: 17036
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
[JBPAPP-10410] fix endpoint instantiation concurrency issue
Property changes on: stack/cxf/tags/jbossws-cxf-3.1.2.SP13
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/cxf/trunk:12339
+ /stack/cxf/branches/jbossws-cxf-3.1.2:17027
/stack/cxf/trunk:12339
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2012-11-26 09:39:52 UTC (rev 17035)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2012-11-26 09:45:39 UTC (rev 17036)
@@ -88,7 +88,8 @@
public abstract class AbstractInvoker implements Invoker
{
private static final Object[] NO_ARGS = new Object[]{};
-
+ private Object targetBean;
+
public Object invoke(Exchange exchange, Object o)
{
// set up the webservice request context
@@ -116,6 +117,15 @@
return new MessageContentsList(retObj);
}
+
+ private synchronized Object getTargetBean(Endpoint ep) throws Exception
+ {
+ if (targetBean == null)
+ {
+ targetBean = ep.getTargetBeanClass().newInstance();
+ }
+ return targetBean;
+ }
private Object _invokeInternal(Exchange exchange, Object o, WrappedMessageContext ctx)
{
@@ -143,7 +153,7 @@
Invocation inv = invHandler.createInvocation();
InvocationContext invContext = inv.getInvocationContext();
- inv.getInvocationContext().addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
+ invContext.addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
invContext.addAttachment(MessageContext.class, ctx);
inv.setJavaMethod(m);
inv.setArgs(params);
@@ -151,6 +161,7 @@
Object retObj = null;
try
{
+ invContext.setTargetBean(getTargetBean(ep)); //JBWS-2486 - JBWS-3002
invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
} catch (InvocationTargetException e) {
12 years
JBossWS SVN: r17035 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-26 04:39:52 -0500 (Mon, 26 Nov 2012)
New Revision: 17035
Added:
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/
Log:
preparing new CXF tag playground
12 years
JBossWS SVN: r17034 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-23 10:15:43 -0500 (Fri, 23 Nov 2012)
New Revision: 17034
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml
Log:
Fixing testsuite compilation
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml 2012-11-23 12:57:44 UTC (rev 17033)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml 2012-11-23 15:15:43 UTC (rev 17034)
@@ -51,6 +51,8 @@
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar" />
<pathelement location="${core.dir}/thirdparty/wstx.jar" />
<pathelement location="${core.dir}/thirdparty/xmlunit.jar" />
+ <pathelement location="${core.dir}/thirdparty/junit.jar" />
+ <pathelement location="${core.dir}/thirdparty/xercesImpl.jar" />
<pathelement
location="${core.dir}/thirdparty/jboss-jaxb-intros.jar" />
</path>
12 years, 1 month
JBossWS SVN: r17033 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-23 07:57:44 -0500 (Fri, 23 Nov 2012)
New Revision: 17033
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
Log:
Adding testcase showing how to force WS-Addressing 2004/08 usage instead of default
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-11-21 13:43:15 UTC (rev 17032)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-11-23 12:57:44 UTC (rev 17033)
@@ -23,9 +23,12 @@
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
+
+import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -60,4 +63,10 @@
assertEquals("Hello World!", proxy.sayHello());
}
+ public void testUsingWSA200408() throws Exception
+ {
+ ((BindingProvider)proxy).getRequestContext().put("javax.xml.ws.addressing.context", new AddressingPropertiesImpl("http://schemas.xmlsoap.org/ws/2004/08/addressing"));
+ assertEquals("Hello World!", proxy.sayHello());
+ }
+
}
12 years, 1 month
JBossWS SVN: r17032 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-21 08:43:15 -0500 (Wed, 21 Nov 2012)
New Revision: 17032
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy.conf
Log:
fix AS deployment
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy.conf 2012-11-21 12:18:56 UTC (rev 17031)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy.conf 2012-11-21 13:43:15 UTC (rev 17032)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/li!
b/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/FastInfoset.jar server/!
all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/al!
l/deploy
ers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/production/deploy/jbossws.sar server/production/deploy/juddi-service.sar server/production/deploy/jbossws-container-jboss-beans.xml server/production/deployers/jbossws.deployer/FastInfoset.jar server/production/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/production/deployers/jbossws.deployer/jbossws-native-core.jar server/production/deployers/jbossws.deployer/jettison.jar server/production/deployers/jbossws.deployer/policy.jar server/production/deployers/jbossws.deployer/wsdl4j.jar server/production/deployers/jbossws.deployer/xmlsec.jar server/production/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/web/depl!
oy/jbossws.sar server/web/deploy/juddi-service.sar server/web/deploy/jbossws-container-jboss-beans.xml server/web/deployers/jbossws.deployer/FastInfoset.jar server/web/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/web/deployers/jbossws.deployer/jbossws-native-core.jar server/web/deployers/jbossws.deployer/jettison.jar server/web/deployers/jbossws.deployer/policy.jar server/web/deployers/jbossws.deployer/wsdl4j.jar server/web/deployers/jbossws.deployer/xmlsec.jar server/web/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/policy.!
jar server/standard/deployers/jbossws.deployer/wsdl4j.jar serv!
er/stand
ard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
12 years, 1 month
JBossWS SVN: r17031 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/sign-encrypt/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-21 07:18:56 -0500 (Wed, 21 Nov 2012)
New Revision: 17031
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
Log:
Test RSA-OAEP key wrap algorithm in SignEncryptTestCase
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2012-11-20 15:59:06 UTC (rev 17030)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2012-11-21 12:18:56 UTC (rev 17031)
@@ -89,7 +89,7 @@
outProps.put("encryptionUser", "Bob");
outProps.put("encryptionParts", "{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body");
outProps.put("encryptionSymAlgorithm", "http://www.w3.org/2001/04/xmlenc#tripledes-cbc");
- outProps.put("encryptionKeyTransportAlgorithm", "http://www.w3.org/2001/04/xmlenc#rsa-1_5");
+ outProps.put("encryptionKeyTransportAlgorithm", "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
cxfEndpoint.getOutInterceptors().add(wssOut);
cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2012-11-20 15:59:06 UTC (rev 17030)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2012-11-21 12:18:56 UTC (rev 17031)
@@ -33,7 +33,7 @@
<entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
<entry key="encryptionParts" value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
- <entry key="encryptionKeyTransportAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ <entry key="encryptionKeyTransportAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
<entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
</map>
</constructor-arg>
12 years, 1 month
JBossWS SVN: r17030 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/extensions/security/element and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-20 10:59:06 -0500 (Tue, 20 Nov 2012)
New Revision: 17030
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
Log:
[JBPAPP-10421] Applying fix
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -76,6 +76,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityDispatcher.class);
+
+ private static boolean VERBOSE_EXCEPTION_REPORTING = Boolean.getBoolean("org.jboss.ws.native.security.verbose_exception_reporting");
public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException
{
@@ -88,7 +90,7 @@
if (secHeaderElement == null)
{
if (hasRequirements(config, fault))
- throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."));
+ throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."), true);
}
try
@@ -263,8 +265,18 @@
private CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
}
+
+ private CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
+ {
+ if (verbose) {
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ } else {
+ QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
+ return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
+ }
+ }
private List<RequireOperation> buildRequireOperations(Config operationConfig, boolean fault)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -32,8 +32,10 @@
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.Util;
+import org.jboss.ws.extensions.security.exception.FailedCheckException;
import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.ws.extensions.security.operation.EncryptionOperation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -128,7 +130,16 @@
}
catch (XMLSecurityException e)
{
- throw new WSSecurityException("Could not parse encrypted key: " + e.getMessage(), e);
+ try
+ {
+ this.secretKey = EncryptionOperation.generateSecretKey(alg);
+ }
+ catch (Exception ex)
+ {
+ WSSecurityException exception = new FailedCheckException(e);
+ exception.setInternal(true);
+ throw exception;
+ }
}
this.document = element.getOwnerDocument();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -32,7 +32,7 @@
{
public static final QName faultCode = new QName(Constants.WSSE_NS, "FailedCheck", Constants.WSSE_PREFIX);
- public static final String faultString = "The signature or decryption was invlaid.";
+ public static final String faultString = "The signature or decryption was invalid.";
public FailedCheckException()
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -72,4 +72,9 @@
{
return faultString;
}
+
+ public void setInternal(boolean internal)
+ {
+ this.internal = internal;
+ }
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -107,7 +107,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException("Decryption was invalid.");
+ throw new FailedCheckException(e);
}
catch (Exception e)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -75,6 +75,7 @@
}
private static HashMap<String, Algorithm> algorithms;
+ private static HashMap<String, String> algorithmsID;
private static final String DEFAULT_ALGORITHM = "aes-128";
@@ -88,6 +89,12 @@
algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
+
+ algorithmsID = new HashMap<String, String>(4);
+ algorithmsID.put(XMLCipher.AES_128, "aes-128");
+ algorithmsID.put(XMLCipher.AES_192, "aes-192");
+ algorithmsID.put(XMLCipher.AES_256, "aes-256");
+ algorithmsID.put(XMLCipher.TRIPLEDES, "tripledes");
}
public EncryptionOperation(List<Target> targets, String alias, String algorithm, String wrap, String tokenRefType, String securityDomainAliasLabel)
@@ -130,7 +137,7 @@
}
}
- public SecretKey getSecretKey(String algorithm) throws WSSecurityException
+ private static SecretKey getSecretKey(String algorithm) throws WSSecurityException
{
Algorithm alg = algorithms.get(algorithm);
@@ -146,6 +153,11 @@
}
}
+ public static SecretKey generateSecretKey(String alg) throws WSSecurityException
+ {
+ return getSecretKey(algorithmsID.get(alg));
+ }
+
public void process(Document message, SecurityHeader header, SecurityStore store) throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2012-11-20 12:47:59 UTC (rev 17029)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2012-11-20 15:59:06 UTC (rev 17030)
@@ -33,7 +33,6 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.extensions.security.exception.FailedAuthenticationException;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -50,10 +49,8 @@
private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1999";
- private static final String FAULT_CODE = "wsse:FailedAuthentication";
+ private static final String FAULT_CODE = "jboss-wsse:GenericError";
- private static final String FAULT_STRING = FailedAuthenticationException.faultString;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war");
@@ -111,8 +108,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault String", FAULT_STRING, faultString);
}
}
@@ -149,8 +144,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
@@ -173,8 +166,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
12 years, 1 month
JBossWS SVN: r17029 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-20 07:47:59 -0500 (Tue, 20 Nov 2012)
New Revision: 17029
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
[JBPAPP-10420] moving to latest wss4j snapshot
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2012-11-20 12:44:54 UTC (rev 17028)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2012-11-20 12:47:59 UTC (rev 17029)
@@ -77,7 +77,7 @@
<servlet.api.version>2.5</servlet.api.version>
<velocity.version>1.5</velocity.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <wss4j.version>1.5.12-patch-01</wss4j.version>
+ <wss4j.version>1.5.12-patch-02-SNAPSHOT</wss4j.version>
<wstx.version>3.2.9</wstx.version>
</properties>
12 years, 1 month
JBossWS SVN: r17028 - in thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security: util and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-20 07:44:54 -0500 (Tue, 20 Nov 2012)
New Revision: 17028
Modified:
thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java
thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/util/WSSecurityUtil.java
Log:
[JBPAPP-10420] Backporting commit 1202218 from upstream
Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java
===================================================================
--- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java 2012-11-18 19:09:55 UTC (rev 17027)
+++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecEncrypt.java 2012-11-20 12:44:54 UTC (rev 17028)
@@ -161,6 +161,9 @@
* @see WSConstants#AES_256
*/
public void setSymmetricEncAlgorithm(String algo) {
+ if (symEncAlgo != null && !symEncAlgo.equals(algo)) {
+ symmetricKey = null;
+ }
symEncAlgo = algo;
}
Modified: thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/util/WSSecurityUtil.java
===================================================================
--- thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/util/WSSecurityUtil.java 2012-11-18 19:09:55 UTC (rev 17027)
+++ thirdparty/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/util/WSSecurityUtil.java 2012-11-20 12:44:54 UTC (rev 17028)
@@ -741,10 +741,31 @@
return doc.createTextNode(Base64.encode(data));
}
+ /**
+ * Convert the raw key bytes into a SecretKey object of type symEncAlgo.
+ */
public static SecretKey prepareSecretKey(String symEncAlgo, byte[] rawKey) {
- SecretKeySpec keySpec =
- new SecretKeySpec(rawKey, JCEMapper.getJCEKeyAlgorithmFromURI(symEncAlgo));
- return (SecretKey) keySpec;
+ // Do an additional check on the keysize required by the encryption algorithm
+ int size = 0;
+ try {
+ size = JCEMapper.getKeyLengthFromURI(symEncAlgo) / 8;
+ } catch (Exception e) {
+ // ignore - some unknown (to JCEMapper) encryption algorithm
+ if (log.isDebugEnabled()) {
+ log.debug(e.getMessage());
+ }
+ }
+ String keyAlgorithm = JCEMapper.getJCEKeyAlgorithmFromURI(symEncAlgo);
+ SecretKeySpec keySpec;
+ if (size > 0) {
+ keySpec =
+ new SecretKeySpec(
+ rawKey, 0, ((rawKey.length > size) ? size : rawKey.length), keyAlgorithm
+ );
+ } else {
+ keySpec = new SecretKeySpec(rawKey, keyAlgorithm);
+ }
+ return (SecretKey)keySpec;
}
public static SOAPConstants getSOAPConstants(Element startElement) {
12 years, 1 month