JBossWS SVN: r16197 - in stack/cxf/trunk: modules/dist and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-20 07:09:02 -0400 (Fri, 20 Apr 2012)
New Revision: 16197
Modified:
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3480] Replacing deprecated <tasks> with <target> in maven-antrun-plugin configurations
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -270,7 +270,7 @@
<id>generate-exclude-file</id>
<phase>validate</phase>
<configuration>
- <tasks>
+ <target>
<mkdir dir="${basedir}/target/exclude-file" />
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss702.txt">
<param name="targetName" expression="jboss702" />
@@ -284,7 +284,7 @@
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt">
<param name="targetName" expression="jboss712" />
</xslt>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/resources/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -33,11 +33,11 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/scripts/zip-other-configs.xml">
<property name="project.build.finalName" value="${project.build.finalName}" />
</ant>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/server/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -280,9 +280,9 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/scripts/antrun-beans-config.xml" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -91,12 +91,12 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<property name="tests.output.dir" value="${project.build.directory}"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -70,12 +70,12 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<property name="tests.output.dir" value="${project.build.directory}"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -98,7 +98,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<property name="maven.test.classpath" refid="maven.test.classpath"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<property name="tests.output.dir" value="${project.build.directory}"/>
@@ -107,7 +107,7 @@
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="endorsed.dir" value="${project.build.directory}/endorsed"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
@@ -116,7 +116,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<property name="maven.test.classpath" refid="maven.test.classpath"/>
<property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
<property name="tests.output.dir" value="${project.build.directory}"/>
@@ -128,7 +128,7 @@
<ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
<ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
@@ -138,7 +138,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy
file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml"
tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
@@ -146,7 +146,7 @@
verbose="true"
overwrite="true"
/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
+++ stack/cxf/trunk/pom.xml 2012-04-20 11:09:02 UTC (rev 16197)
@@ -1345,12 +1345,12 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<echo />
<echo message="profile=${jbossws.integration.target}" />
<echo message="jboss.home=${jboss.home}" />
<echo />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
12 years, 8 months
- 1
- 0
JBossWS SVN: r16196 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-20 06:21:32 -0400 (Fri, 20 Apr 2012)
New Revision: 16196
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Moving to cxf 2.4.6-patch-01-SNAPSHOT
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-20 10:05:29 UTC (rev 16195)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-04-20 10:21:32 UTC (rev 16196)
@@ -66,7 +66,7 @@
<jbossws.shared.testsuite.version>4.0.4-SNAPSHOT</jbossws.shared.testsuite.version>
<jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <!-- replace with the EAP6 snapshot version -->
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.4.6</cxf.version>
+ <cxf.version>2.4.6-patch-01-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
12 years, 8 months
- 1
- 0
JBossWS SVN: r16195 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-20 06:05:29 -0400 (Fri, 20 Apr 2012)
New Revision: 16195
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16049,16076,16084,16088,16090,16094,16097,16102,16164 via svnmerge
.......
r16049 | alessio.soldano(a)jboss.com | 2012-03-27 08:26:49 +0200 (Tue, 27 Mar 2012) | 2 lines
Move to junit 3.8.2
.......
r16076 | alessio.soldano(a)jboss.com | 2012-04-02 12:32:07 +0200 (Mon, 02 Apr 2012) | 2 lines
[JBWS-3477] A bit of refactoring to the jbossws-cxf endorse testcase
.......
r16084 | alessio.soldano(a)jboss.com | 2012-04-03 15:02:57 +0200 (Tue, 03 Apr 2012) | 2 lines
[JBWS-3478] Adding testcase for checking jbossws-cxf functionalities when Spring is available in user app
.......
r16088 | alessio.soldano(a)jboss.com | 2012-04-04 11:18:23 +0200 (Wed, 04 Apr 2012) | 2 lines
[JBWS-3478] Excluding test on AS 702 due to logging dependencies issues
.......
r16090 | alessio.soldano(a)jboss.com | 2012-04-04 11:32:42 +0200 (Wed, 04 Apr 2012) | 2 lines
[JBWS-3474] Updating exclude
.......
r16094 | alessio.soldano(a)jboss.com | 2012-04-04 14:51:15 +0200 (Wed, 04 Apr 2012) | 2 lines
Fix testcases to follow best practices: specs do not allow @WebServlet on classes not implementing javax.servlet.http.HttpServlet
.......
r16097 | alessio.soldano(a)jboss.com | 2012-04-04 17:07:45 +0200 (Wed, 04 Apr 2012) | 2 lines
Avoid using ${project.parent.build.directory} which is not working anymore with recent antrun maven plugin versions
.......
r16102 | alessio.soldano(a)jboss.com | 2012-04-05 10:08:46 +0200 (Thu, 05 Apr 2012) | 2 lines
Solve AS 7.0.2 regression caused by -r 16094 by making MultipleClientsServiceImpl an EJB3 ws endpoint, given JBWS-3276 is fixed starting from AS 7.1.0
.......
r16164 | alessio.soldano(a)jboss.com | 2012-04-16 10:35:02 +0200 (Mon, 16 Apr 2012) | 2 lines
[JBWS-3448] Upgrade to Apache CXF 2.5.3
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 8 months
- 1
- 0
JBossWS SVN: r16194 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist/src/main/scripts and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-20 06:01:53 -0400 (Fri, 20 Apr 2012)
New Revision: 16194
Added:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
Log:
Merged revisions 16087,16096,16183 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16087 | alessio.soldano(a)jboss.com | 2012-04-04 11:04:51 +0200 (Wed, 04 Apr 2012) | 2 lines
Adding in-container wsse client testing
.......
r16096 | alessio.soldano(a)jboss.com | 2012-04-04 15:08:29 +0200 (Wed, 04 Apr 2012) | 2 lines
Fixing test potentially messing up with client thread default bus
.......
r16183 | alessio.soldano(a)jboss.com | 2012-04-19 13:17:05 +0200 (Thu, 19 Apr 2012) | 2 lines
[JBWS-3489] Adding modules-deploy.conf to binary distro
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086,16176
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-04-20 06:45:36 UTC (rev 16193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-04-20 10:01:53 UTC (rev 16194)
@@ -37,8 +37,7 @@
<directory>../resources/src/main/resources/resources</directory>
<outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory>
<includes>
- <include>deploy.conf</include>
- <include>server-deploy.conf</include>
+ <include>modules-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-04-20 06:45:36 UTC (rev 16193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-04-20 10:01:53 UTC (rev 16194)
@@ -178,6 +178,22 @@
<include name="alice.jks" />
</metainf>
</jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/wsf/test/ClientHelper.class"/>
+ <include name="org/jboss/wsf/test/TestServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
+ </classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt" prefix="WEB-INF/classes">
+ <include name="META-INF/alice.properties" />
+ <include name="META-INF/alice.jks" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services, org.apache.ws.security"/>
+ </manifest>
+ </war>
<!-- jaxws-samples-wsse-policy-sign-encrypt-mc-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc-client.jar">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2012-04-20 06:45:36 UTC (rev 16193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2012-04-20 10:01:53 UTC (rev 16194)
@@ -74,11 +74,17 @@
Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
Bus bus = BusFactory.getThreadDefaultBus(false);
CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
- bus.getExtension(ClientLifeCycleManager.class).registerListener(listener);
- assertEquals(0, listener.getCount());
- EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
- assertEquals(1, listener.getCount());
- assertEquals("Foo", portOne.echo("Foo"));
+ ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+ try {
+ mgr.registerListener(listener);
+ assertEquals(0, listener.getCount());
+ EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals(1, listener.getCount());
+ assertEquals("Foo", portOne.echo("Foo"));
+ } finally {
+ mgr.unRegisterListener(listener);
+ }
+
}
private class CustomClientLifeCycleListener implements ClientLifeCycleListener
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-04-20 06:45:36 UTC (rev 16193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-04-20 10:01:53 UTC (rev 16194)
@@ -21,16 +21,12 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPFaultException;
-
import junit.framework.Test;
-import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -47,32 +43,24 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(SignEncryptGCMTestCase.class, "jaxws-samples-wsse-policy-sign-encrypt-client.jar jaxws-samples-wsse-policy-sign-encrypt-gcm.war");
+ return new JBossWSCXFTestSetup(SignEncryptGCMTestCase.class,
+ "jaxws-samples-wsse-policy-sign-encrypt-client.jar " +
+ "jaxws-samples-wsse-policy-sign-encrypt-client.war " +
+ "jaxws-samples-wsse-policy-sign-encrypt-gcm.war");
}
-
- public void test() throws Exception
+
+ public void testClientSide() throws Exception
{
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy);
- try
- {
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ SignEncryptHelper helper = new SignEncryptHelper();
+ helper.setTargetEndpoint(serviceURL);
+ assertTrue(helper.testSignEncrypt());
}
- private void setupWsse(ServiceIface proxy)
+ public void testServerSide() throws Exception
{
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+ "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("1", br.readLine());
}
}
Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java (from rev 16087, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2012-04-20 10:01:53 UTC (rev 16194)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.ClientHelper;
+
+public class SignEncryptHelper implements ClientHelper
+{
+ private String targetEndpoint;
+
+ @Override
+ public void setTargetEndpoint(String address)
+ {
+ targetEndpoint = address;
+ }
+
+ public boolean testSignEncrypt() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ BusFactory.setThreadDefaultBus(bus);
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(targetEndpoint + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy);
+ try
+ {
+ return "Secure Hello World!".equals(proxy.sayHello());
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy)
+ {
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ }
+
+}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2012-04-20 06:45:36 UTC (rev 16193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2012-04-20 10:01:53 UTC (rev 16194)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,16 +21,12 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPFaultException;
-
import junit.framework.Test;
-import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -46,32 +42,24 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-policy-sign-encrypt-client.jar jaxws-samples-wsse-policy-sign-encrypt.war");
+ return new JBossWSCXFTestSetup(SignEncryptTestCase.class,
+ "jaxws-samples-wsse-policy-sign-encrypt-client.jar " +
+ "jaxws-samples-wsse-policy-sign-encrypt-client.war " +
+ "jaxws-samples-wsse-policy-sign-encrypt.war");
}
-
- public void test() throws Exception
+
+ public void testClientSide() throws Exception
{
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy);
- try
- {
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ SignEncryptHelper helper = new SignEncryptHelper();
+ helper.setTargetEndpoint(serviceURL);
+ assertTrue(helper.testSignEncrypt());
}
- private void setupWsse(ServiceIface proxy)
+ public void testServerSide() throws Exception
{
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+ "path=/jaxws-samples-wsse-policy-sign-encrypt&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("1", br.readLine());
}
}
12 years, 8 months
- 1
- 0
JBossWS SVN: r16193 - thirdparty/cxf/branches/cxf-2.4.6/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-04-20 02:45:36 -0400 (Fri, 20 Apr 2012)
New Revision: 16193
Modified:
thirdparty/cxf/branches/cxf-2.4.6/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Log:
[JBPAPP-7713]: back port the CXF-4247 fix to resolve the performance issue
Modified: thirdparty/cxf/branches/cxf-2.4.6/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java 2012-04-20 06:39:49 UTC (rev 16192)
+++ thirdparty/cxf/branches/cxf-2.4.6/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java 2012-04-20 06:45:36 UTC (rev 16193)
@@ -24,7 +24,9 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
import java.util.logging.Level;
@@ -78,11 +80,15 @@
*/
private Map<Object, Class> responseMethodClassCache;
private Map<Object, Class> requestMethodClassCache;
+ private List responseMethodClassNotFoundCache;
+ private List requestMethodClassNotFoundCache;
private Map<Method, Annotation[][]> methodAnnotationCache;
public JaxWsServiceConfiguration() {
responseMethodClassCache = new HashMap<Object, Class>();
requestMethodClassCache = new HashMap<Object, Class>();
+ responseMethodClassNotFoundCache = new ArrayList();
+ requestMethodClassNotFoundCache = new ArrayList();
methodAnnotationCache = new HashMap<Method, Annotation[][]>();
}
@@ -598,6 +604,9 @@
@Override
public Class getResponseWrapper(Method selected) {
+ if (this.responseMethodClassNotFoundCache.contains(selected)) {
+ return null;
+ }
Class cachedClass = responseMethodClassCache.get(selected);
if (cachedClass != null) {
return cachedClass;
@@ -635,7 +644,7 @@
//do nothing, we will mock a schema for wrapper bean later on
}
}
-
+ this.responseMethodClassNotFoundCache.add(selected);
return null;
}
@@ -669,6 +678,9 @@
@Override
public Class getRequestWrapper(Method selected) {
+ if (this.requestMethodClassNotFoundCache.contains(selected)) {
+ return null;
+ }
Class cachedClass = requestMethodClassCache.get(selected);
if (cachedClass != null) {
return cachedClass;
@@ -703,7 +715,7 @@
//do nothing, we will mock a schema for wrapper bean later on
}
}
-
+ this.requestMethodClassNotFoundCache.add(selected);
return null;
}
12 years, 8 months
- 1
- 0
JBossWS SVN: r16192 - in thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/policy/server and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-04-20 02:39:49 -0400 (Fri, 20 Apr 2012)
New Revision: 16192
Removed:
thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/Server.java
thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl
thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
Log:
Fix the failed test as did in http://svn.apache.org/viewvc?rev=1235708&view=rev
Deleted: thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java 2012-04-20 06:04:28 UTC (rev 16191)
+++ thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java 2012-04-20 06:39:49 UTC (rev 16192)
@@ -1,131 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.ws.policy;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.policy.server.Server;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
-import org.example.contract.doubleit.DoubleItPortType;
-
-import org.junit.BeforeClass;
-
-/**
- * This is a test for policy alternatives. The endpoint requires either a UsernameToken (insecured) OR
- * a message signature using the Asymmetric binding.
- */
-public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String PORT2 = allocatePort(Server.class, 2);
-
- private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
- private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
-
- @BeforeClass
- public static void startServers() throws Exception {
- assertTrue(
- "Server failed to launch",
- // run the server in the same process
- // set this to false to fork
- launchServer(Server.class, true)
- );
- }
-
- /**
- * The client uses the Asymmetric policy - this should succeed.
- */
- @org.junit.Test
- public void testAsymmetric() throws Exception {
-
- SpringBusFactory bf = new SpringBusFactory();
- URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
-
- Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
-
- URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
- Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricPort");
- DoubleItPortType utPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
-
- utPort.doubleIt(25);
- }
-
- /**
- * The client uses no security - this should fail.
- */
- @org.junit.Test
- public void testNoSecurity() throws Exception {
-
- SpringBusFactory bf = new SpringBusFactory();
- URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
-
- Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
-
- URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
- Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItNoSecurityPort");
- DoubleItPortType utPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
-
- try {
- utPort.doubleIt(25);
- fail("Failure expected on no Security");
- } catch (javax.xml.ws.soap.SOAPFaultException ex) {
- // expected
- }
- }
-
- /**
- * The client uses the UsernameToken policy - this should succeed.
- */
- @org.junit.Test
- public void testUsernameToken() throws Exception {
-
- SpringBusFactory bf = new SpringBusFactory();
- URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
-
- Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
-
- URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
- Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItUsernameTokenPort");
- DoubleItPortType utPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
-
- utPort.doubleIt(25);
- }
-
-}
Deleted: thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/Server.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/Server.java 2012-04-20 06:04:28 UTC (rev 16191)
+++ thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/server/Server.java 2012-04-20 06:39:49 UTC (rev 16192)
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.ws.policy.server;
-
-import java.net.URL;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-public class Server extends AbstractBusTestServerBase {
-
- public Server() {
-
- }
-
- protected void run() {
- URL busFile = Server.class.getResource("server.xml");
- Bus busLocal = new SpringBusFactory().createBus(busFile);
- BusFactory.setDefaultBus(busLocal);
- setBus(busLocal);
-
- try {
- new Server();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
Deleted: thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl 2012-04-20 06:04:28 UTC (rev 16191)
+++ thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl 2012-04-20 06:39:49 UTC (rev 16192)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions name="DoubleIt"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
- targetNamespace="http://www.example.org/contract/DoubleIt"
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsaws="http://www.w3.org/2005/08/addressing"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
- xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
-
- <wsdl:import location="src/test/resources/DoubleItLogical.wsdl"
- namespace="http://www.example.org/contract/DoubleIt"/>
-
- <wsdl:binding name="DoubleItInlinePolicyBinding" type="tns:DoubleItPortType">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="DoubleIt">
- <soap:operation soapAction="" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="DoubleItFault">
- <soap:body use="literal" name="DoubleItFault" />
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="DoubleItService">
- <wsdl:port name="DoubleItAsymmetricPort" binding="tns:DoubleItInlinePolicyBinding">
- <soap:address location="http://localhost:9010/DoubleItAsymmetric" />
- </wsdl:port>
- <wsdl:port name="DoubleItUsernameTokenPort" binding="tns:DoubleItInlinePolicyBinding">
- <soap:address location="http://localhost:9010/DoubleItUsernameToken" />
- </wsdl:port>
- <wsdl:port name="DoubleItNoSecurityPort" binding="tns:DoubleItInlinePolicyBinding">
- <soap:address location="http://localhost:9010/DoubleItNoSecurity" />
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
Deleted: thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml 2012-04-20 06:04:28 UTC (rev 16191)
+++ thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml 2012-04-20 06:39:49 UTC (rev 16192)
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
- http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd"
->
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <jaxws:client
- name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPort"
- createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.username" value="Alice" />
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.username" value="bob" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.signature.username" value="alice" />
- </jaxws:properties>
- <jaxws:features>
- <p:policies>
- <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Asymmetric" />
- </p:policies>
- </jaxws:features>
- </jaxws:client>
-
- <jaxws:client
- name="{http://www.example.org/contract/DoubleIt}DoubleItNoSecurityPort"
- createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.username" value="Alice" />
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.username" value="bob" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.signature.username" value="alice" />
- </jaxws:properties>
- </jaxws:client>
-
- <jaxws:client
- name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort"
- createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.username" value="Alice" />
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.username" value="bob" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.signature.username" value="alice" />
- </jaxws:properties>
- <jaxws:features>
- <p:policies>
- <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#UsernameToken" />
- </p:policies>
- </jaxws:features>
- </jaxws:client>
-
-
- <wsp:Policy wsu:Id="UsernameToken"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SupportingTokens>
- <wsp:Policy>
- <sp:UsernameToken
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..." />
- </wsp:Policy>
- </sp:SupportingTokens>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="Asymmetric"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- <sp:OnlySignEntireHeadersAndBody />
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128 />
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
-</beans>
Deleted: thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml 2012-04-20 06:04:28 UTC (rev 16191)
+++ thirdparty/cxf/branches/cxf-2.4.6/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml 2012-04-20 06:39:49 UTC (rev 16192)
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:p="http://cxf.apache.org/policy"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd
- ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <jaxws:endpoint id="AsymmetricEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItAsymmetric"
- serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort"
- xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
-
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username" value="alice" />
- </jaxws:properties>
- <jaxws:features>
- <p:policies>
- <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Combined" />
- </p:policies>
- </jaxws:features>
-
- </jaxws:endpoint>
-
- <jaxws:endpoint id="NoSecurityEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItNoSecurity"
- serviceName="s:DoubleItService" endpointName="s:DoubleItNoSecurityPort"
- xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
-
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username" value="alice" />
- </jaxws:properties>
- <jaxws:features>
- <p:policies>
- <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Combined" />
- </p:policies>
- </jaxws:features>
-
- </jaxws:endpoint>
-
- <jaxws:endpoint id="UsernameTokenEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItUsernameToken"
- serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort"
- xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
-
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
- <entry key="ws-security.signature.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" />
- <entry key="ws-security.encryption.properties"
- value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" />
- <entry key="ws-security.encryption.username" value="alice" />
- </jaxws:properties>
- <jaxws:features>
- <p:policies>
- <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="#Combined" />
- </p:policies>
- </jaxws:features>
-
- </jaxws:endpoint>
-
-
- <wsp:Policy wsu:Id="Combined"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <wsp:Policy wsu:Id="UsernameToken"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SupportingTokens>
- <wsp:Policy>
- <sp:UsernameToken
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..." />
- </wsp:Policy>
- </sp:SupportingTokens>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- </wsp:All>
- <wsp:All>
- <wsp:Policy wsu:Id="Asymmetric"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token
- sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10 />
- <sp:RequireIssuerSerialReference />
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- <sp:OnlySignEntireHeadersAndBody />
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128 />
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
-
-
-</beans>
12 years, 8 months
- 1
- 0
JBossWS SVN: r16191 - thirdparty/cxf/branches/cxf-2.4.6/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-04-20 02:04:28 -0400 (Fri, 20 Apr 2012)
New Revision: 16191
Modified:
thirdparty/cxf/branches/cxf-2.4.6/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
Log:
To fix the aegis test as done in http://svn.apache.org/viewvc?view=revision&revision=1245645
Modified: thirdparty/cxf/branches/cxf-2.4.6/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java 2012-04-20 03:56:19 UTC (rev 16190)
+++ thirdparty/cxf/branches/cxf-2.4.6/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java 2012-04-20 06:04:28 UTC (rev 16191)
@@ -643,9 +643,8 @@
type.setSchemaType(new QName("urn:foo", "ExtendingInterface"));
Set<AegisType> dependencies = type.getDependencies();
- assertEquals(2, dependencies.size());
- dependencies.remove(stringType);
- assertEquals(SimpleInterface.class, dependencies.iterator().next().getTypeClass());
+ assertEquals(1, dependencies.size());
+ assertEquals(String.class, dependencies.iterator().next().getTypeClass());
}
@Test
12 years, 8 months
- 1
- 0
JBossWS SVN: r16190 - legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-04-19 23:56:19 -0400 (Thu, 19 Apr 2012)
New Revision: 16190
Modified:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
Log:
[JBPAPP-8570] Removing extra parameter datatype=JBossWSMessage from request URLs
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2012-04-20 02:16:40 UTC (rev 16189)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2012-04-20 03:56:19 UTC (rev 16190)
@@ -209,7 +209,10 @@
{
// Get the invoker from Remoting for a given endpoint address
log.debug("Get locator for: " + endpoint);
- targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "JBossWSMessage");
+
+ //[JBPAPP-8570] This URL query param sometimes confuses endpoints
+ //targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "JBossWSMessage");
+
InvokerLocator locator = new InvokerLocator(targetAddress);
/* An HTTPClientInvoker may disconnect from the server and recreated by the remoting layer.
12 years, 8 months
- 1
- 0
JBossWS SVN: r16189 - in legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570: jbossws-core/src/java/org/jboss/ws/core/jaxws/spi and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-04-19 22:16:40 -0400 (Thu, 19 Apr 2012)
New Revision: 16189
Modified:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java
Log:
Committing patches [JBWS-1620][JBWS-1833][JBWS-1903] to one-off branch for 1.2.1.GA_CP01
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -55,6 +55,7 @@
{
this.epMetaData = epMetaData;
initBinding(epMetaData.getBindingId(), epMetaData.getType());
+ this.epMetaData.registerConfigObserver(this);
configure();
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -38,6 +38,7 @@
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -59,6 +60,7 @@
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass)
{
ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
+ DOMUtils.clearThreadLocals();
return delegate;
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -67,6 +67,7 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPConnectionImpl;
import org.jboss.ws.core.utils.ThreadLocalAssociation;
+import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -490,6 +491,8 @@
// clear thread local storage
ThreadLocalAssociation.clear();
+
+ DOMUtils.clearThreadLocals();
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.PushbackInputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.Enumeration;
@@ -89,6 +90,7 @@
String boundaryParameter = contentType.getParameter("boundary");
String start = contentType.getParameter("start");
byte[] boundary;
+ byte[] crlf;
if (boundaryParameter == null)
throw new IllegalArgumentException("multipart/related content type did not contain a boundary");
@@ -100,13 +102,19 @@
boundary = ("--" + boundaryParameter).getBytes("US-ASCII");
else
boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII");
+
+ crlf = ("\r\n").getBytes("US-ASCII");
}
catch (UnsupportedEncodingException e)
{
throw new WSException("US-ASCII not supported, this should never happen");
}
+
+ // [JBWS-1620] - Incorrect handling of MIME boundaries in MultipartRelatedDecoder
+ PushbackInputStream pushBackStream = new PushbackInputStream(stream,2);
+ pushBackStream.unread(crlf);
- BoundaryDelimitedInputStream delimitedStream = new BoundaryDelimitedInputStream(stream, boundary);
+ BoundaryDelimitedInputStream delimitedStream = new BoundaryDelimitedInputStream(pushBackStream, boundary);
// Eat first inner stream since its empty
byte[] buffer = new byte[256];
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -93,6 +93,12 @@
{
}
+ public static void clearThreadLocals()
+ {
+ documentThreadLocal.remove();
+ builderThreadLocal.remove();
+ }
+
/** Initialise the the DocumentBuilder
*/
public static DocumentBuilder getDocumentBuilder()
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -71,8 +71,8 @@
public static void clear()
{
- invokerMDBAssoc.set(null);
- msgContextAssoc.set(null);
- strTransformAssoc.set(null);
+ invokerMDBAssoc.remove();
+ msgContextAssoc.remove();
+ strTransformAssoc.remove();
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -52,6 +52,8 @@
import java.lang.reflect.Method;
import java.util.*;
+import java.lang.ref.WeakReference;
+
/**
* A Service component describes a set of endpoints.
*
@@ -604,9 +606,6 @@
if (config == null)
initEndpointConfig();
- // register any configurable with the ConfigProvider
- configObservable.addObserver(configurable);
-
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
@@ -715,11 +714,51 @@
class ConfigObservable extends Observable
{
+
+ private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>();
+
public void doNotify(Object object)
{
setChanged();
notifyObservers(object);
}
+
+ public synchronized void addObserver(Observer o)
+ {
+ observer.add( new WeakReference(o));
+ }
+
+ public synchronized void deleteObserver(Observer o)
+ {
+ for(WeakReference<Observer> w : observer)
+ {
+ Observer tmp = w.get();
+ if(tmp.equals(o))
+ {
+ observer.remove(o);
+ break;
+ }
+
+ }
+ }
+
+ public void notifyObservers()
+ {
+ notifyObservers(null);
+ }
+
+ public void notifyObservers(Object arg)
+ {
+ if(hasChanged())
+ {
+ for(WeakReference<Observer> w : observer)
+ {
+ Observer tmp = w.get();
+ tmp.update(this, arg);
+
+ }
+ }
+ }
}
public List<UnifiedPortComponentRefMetaData> getServiceRefContrib()
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2012-04-19 23:11:28 UTC (rev 16188)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2012-04-20 02:16:40 UTC (rev 16189)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxrpc.jbws626;
+import org.jboss.ws.core.CommonMessageContext;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -83,6 +85,10 @@
wasName = soapElement.getElementName();
assertElementName(expName, wasName);
}
+
+ // for testing the CommonBindingProvider memory leak. Not related to this test...
+ ((CommonMessageContext)msgContext).setModified(true);
+
}
catch (SOAPException ex)
{
12 years, 8 months
- 1
- 0
JBossWS SVN: r16188 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-04-19 19:11:28 -0400 (Thu, 19 Apr 2012)
New Revision: 16188
Added:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-8570/
Log:
Creating one-off branch
12 years, 8 months
- 1
- 0