May 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r14337 - in stack/native: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-10 02:36:54 -0400 (Tue, 10 May 2011) New Revision: 14337 Added: stack/native/tags/jbossws-native-3.1.2.SP9/ Removed: stack/native/branches/jbossws-native-3.1.2.SP9/ Log: Tagging jbossws-native-3.1.2.SP9

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14336 - in stack/native/branches/jbossws-native-3.1.2.SP9: modules/core/src/main/java/org/jboss/ws/core/soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-10 02:35:49 -0400 (Tue, 10 May 2011) New Revision: 14336 Modified: stack/native/branches/jbossws-native-3.1.2.SP9/ stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java Log: svn merge -r 14326:14327 Property changes on: stack/native/branches/jbossws-native-3.1.2.SP9 ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/branches/jbossws-native-3.1.2:14327 Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-05-10 06:09:33 UTC (rev 14335) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-05-10 06:35:49 UTC (rev 14336) @@ -118,8 +118,7 @@ String prefix = domElement.getPrefix() != null ? domElement.getPrefix() : ""; String nsURI = domElement.getNamespaceURI() != null ? domElement.getNamespaceURI() : ""; - SOAPFactory factory = SOAPFactory.newInstance(); - SOAPElement soapElement = factory.createElement(localName, prefix, nsURI); + SOAPElement soapElement = this.createElement(localName, prefix, nsURI); DOMUtils.copyAttributes(soapElement, domElement);

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14335 - in stack/native/branches/jbossws-native-3.1.2.SP9: modules/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-10 02:09:33 -0400 (Tue, 10 May 2011) New Revision: 14335 Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/client/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/endorsed/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/management/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/resources/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/framework-tests/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/pom.xml stack/native/branches/jbossws-native-3.1.2.SP9/pom.xml Log: Updating poms Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/client/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/client/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/core/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/endorsed/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/endorsed/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/endorsed/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/management/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/management/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/management/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/resources/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/resources/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/framework-tests/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/framework-tests/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/native-tests/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/native-tests/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/modules/testsuite/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.2.SP9/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP9/pom.xml 2011-05-10 05:37:48 UTC (rev 14334) +++ stack/native/branches/jbossws-native-3.1.2.SP9/pom.xml 2011-05-10 06:09:33 UTC (rev 14335) @@ -17,7 +17,7 @@ <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> - <version>3.1.2.SP8</version> + <version>3.1.2.SP9</version>  <parent> @@ -28,9 +28,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> </scm>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14334 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-10 01:37:48 -0400 (Tue, 10 May 2011) New Revision: 14334 Added: stack/native/branches/jbossws-native-3.1.2.SP9/ Log: Branching from 3.1.2.SP8 tag

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14333 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/policy/username/WEB-INF and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-09 11:21:05 -0400 (Mon, 09 May 2011) New Revision: 14333 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl Log: [JBWS-3284] Fixing Username + https testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java 2011-05-09 15:21:05 UTC (rev 14333) @@ -48,7 +48,7 @@ System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc"); System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); System.setProperty("javax.net.ssl.trustStoreType", "jks"); - return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); + return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wsse-policy-username.war"); } public void test() throws Exception @@ -82,6 +82,6 @@ private void setupWsse(ServiceIface proxy, String username) { ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username); - ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wssePolicy.UsernamePasswordCallback"); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wsse.policy.UsernamePasswordCallback"); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml 2011-05-09 15:21:05 UTC (rev 14333) @@ -12,4 +12,14 @@ <servlet-name>TestService</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>TestService</web-resource-name> + <url-pattern>/*</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> </web-app> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl 2011-05-09 15:21:05 UTC (rev 14333) @@ -41,7 +41,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wssePolicy-username"/> + <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-username"/> </port> </service>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14332 - in stack/native/trunk/modules/dist: management and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-05-09 10:59:28 -0400 (Mon, 09 May 2011) New Revision: 14332 Modified: stack/native/trunk/modules/dist/management/pom.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3289] test helper classes moved to different module - use it Modified: stack/native/trunk/modules/dist/management/pom.xml =================================================================== --- stack/native/trunk/modules/dist/management/pom.xml 2011-05-09 14:39:49 UTC (rev 14331) +++ stack/native/trunk/modules/dist/management/pom.xml 2011-05-09 14:59:28 UTC (rev 14332) @@ -20,11 +20,16 @@ <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> - <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <scope>test</scope> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600</artifactId> <scope>provided</scope> <exclusions> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2011-05-09 14:39:49 UTC (rev 14331) +++ stack/native/trunk/modules/dist/pom.xml 2011-05-09 14:59:28 UTC (rev 14332) @@ -50,7 +50,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss700</classifier> + <classifier>jboss700</classifier> </dependency> <dependency> @@ -63,6 +63,11 @@ <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> <type>zip</type> <scope>test</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-09 14:39:49 UTC (rev 14331) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-09 14:59:28 UTC (rev 14332) @@ -101,6 +101,17 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>test</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <includes>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14331 - in stack/cxf/trunk/modules/dist: management and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-05-09 10:39:49 -0400 (Mon, 09 May 2011) New Revision: 14331 Modified: stack/cxf/trunk/modules/dist/management/pom.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3289] test helper classes moved to different module - use it Modified: stack/cxf/trunk/modules/dist/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/management/pom.xml 2011-05-09 14:34:52 UTC (rev 14330) +++ stack/cxf/trunk/modules/dist/management/pom.xml 2011-05-09 14:39:49 UTC (rev 14331) @@ -21,9 +21,14 @@ <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> - <scope>provided</scope> + <scope>test</scope> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-05-09 14:34:52 UTC (rev 14330) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-05-09 14:39:49 UTC (rev 14331) @@ -59,6 +59,11 @@ <type>zip</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <scope>test</scope> + </dependency>  <dependency> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-09 14:34:52 UTC (rev 14330) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-09 14:39:49 UTC (rev 14331) @@ -104,6 +104,17 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>test</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <includes>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14330 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-05-09 10:34:52 -0400 (Mon, 09 May 2011) New Revision: 14330 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3289] test helper classes moved to different module - use it Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-09 14:27:24 UTC (rev 14329) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-09 14:34:52 UTC (rev 14330) @@ -391,6 +391,7 @@ --> <path id="integration.target.client.classpath"> <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/>  + <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  <pathelement location="${jboss.home}/jboss-modules.jar"/> <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> <include name="jboss-logging-*.jar"/> @@ -615,6 +616,7 @@ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> + <sysproperty key="org.jboss.wsf.spi.deployer.Deployer" value="org.jboss.wsf.test.DeployerJBoss6"/> <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/> @@ -676,6 +678,7 @@ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> + <sysproperty key="org.jboss.wsf.spi.deployer.Deployer" value="org.jboss.wsf.test.DeployerJBoss6"/> <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14329 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-05-09 10:27:24 -0400 (Mon, 09 May 2011) New Revision: 14329 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java Log: [JBWS-3272] Update callbackhandlers Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2011-05-09 13:43:04 UTC (rev 14328) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2011-05-09 14:27:24 UTC (rev 14329) @@ -33,7 +33,9 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; - if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword()))) - throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed."); + if ("kermit".equals(pc.getIdentifier())) + pc.setPassword("thefrog"); + else + pc.setPassword("wrong password"); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2011-05-09 13:43:04 UTC (rev 14328) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernamePasswordCallback.java 2011-05-09 14:27:24 UTC (rev 14329) @@ -33,9 +33,8 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; + //this CallbackHandler is meant for use with WSS4J 1.6, see http://ws.apache.org/wss4j/wss4j16.html if ("kermit".equals(pc.getIdentifier())) pc.setPassword("thefrog"); - else - pc.setPassword("wrong password"); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java 2011-05-09 13:43:04 UTC (rev 14328) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java 2011-05-09 14:27:24 UTC (rev 14329) @@ -33,7 +33,8 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; - if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword()))) - throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed."); + //this CallbackHandler is meant for use with WSS4J 1.6, see http://ws.apache.org/wss4j/wss4j16.html + if ("kermit".equals(pc.getIdentifier())) + pc.setPassword("thefrog"); } }

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14328 - in stack/cxf/trunk: modules/testsuite and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-05-09 09:43:04 -0400 (Mon, 09 May 2011) New Revision: 14328 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/ClientHelper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/ Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml stack/cxf/trunk/pom.xml Log: shared-testsuite have to have test scope - refactoring CXF helper classes to test sources - fixing JVM property propagation Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-05-09 13:26:25 UTC (rev 14327) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-05-09 13:43:04 UTC (rev 14328) @@ -95,8 +95,6 @@ <include name="org/jboss/test/ws/jaxws/cxf/gzip/Helper.class"/> <include name="org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.class"/> <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld.class"/> - </classes> - <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/wsf/test/TestServlet.class"/> <include name="org/jboss/wsf/test/ClientHelper.class"/> </classes> @@ -121,15 +119,13 @@ <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/UserType.class"/> <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotatedUserEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotatedUserType.class"/> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/wsf/test/ClientHelper.class"/> <include name="test-resources/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"/> </classes> <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/jaxbintros/META-INF"> <include name="jaxb-intros.xml"/> </classes> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - </classes> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/> </manifest> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/ClientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/ClientHelper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/ClientHelper.java 2011-05-09 13:43:04 UTC (rev 14328) @@ -0,0 +1,27 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.wsf.test; + +public interface ClientHelper +{ + public void setTargetEndpoint(String address); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-05-09 13:43:04 UTC (rev 14328) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.wsf.test; + +import junit.framework.Test; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.jboss.logging.Logger; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class JBossWSCXFTestSetup extends JBossWSTestSetup +{ + private Bus defaultBus; + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList) + { + super(testClass, archiveList); + } + + public JBossWSCXFTestSetup(Test test, String archiveList) + { + super(test, archiveList); + } + + public JBossWSCXFTestSetup(Test test) + { + super(test); + } + + @Override + protected void setUp() throws Exception { + defaultBus = BusFactory.getDefaultBus(false); + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + try + { + Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false); + + if (defaultBus == null && afterTestsDefaultBus != null) + { + Logger.getLogger(this.getClass()).info("Default CXF bus has been set during test execution"); + } + else if (defaultBus != afterTestsDefaultBus) + { + throw new Exception("CXF Default bus changed during test: \nBEFORE: " + defaultBus + "\nAFTER: " + + afterTestsDefaultBus); + } + } + finally + { + defaultBus = null; //remove reference, to help GC + super.tearDown(); + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2011-05-09 13:43:04 UTC (rev 14328) @@ -0,0 +1,135 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.wsf.test; + +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 01-Apr-2011 + * + */ +@WebServlet(name = "TestServlet", urlPatterns = "/*") +public class TestServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String helperClassName = req.getParameter("helper"); + if (helperClassName == null || helperClassName.length() == 0) + throw new ServletException("helper not specified!"); + String path = req.getParameter("path"); + if (path == null || path.length() == 0) + throw new ServletException("path not specified!"); + try + { + ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance(); + helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path); + List<String> failedTests = new LinkedList<String>(); + List<String> errorTests = new LinkedList<String>(); + Method[] methods = helper.getClass().getMethods(); + String methodName = req.getParameter("method"); + int testsRun = 0; + if (methodName != null && methodName.length() > 0) + { + Method m = null; + m = helper.getClass().getMethod(methodName); + testsRun++; + invokeMethod(m, helper, failedTests, errorTests); + } + else + { + for (Method m : methods) + { + if (m.getName().startsWith("test") && m.getParameterTypes().length == 0 + && m.getReturnType().equals(boolean.class)) + { + testsRun++; + invokeMethod(m, helper, failedTests, errorTests); + } + } + } + if (failedTests.isEmpty() && errorTests.isEmpty()) + { + res.getWriter().print(testsRun); + } + else + { + PrintWriter w = res.getWriter(); + w.print("# Failed tests: "); + for (Iterator<String> it = failedTests.iterator(); it.hasNext();) + { + w.print(it.next()); + if (it.hasNext()) + w.print(", "); + } + res.getWriter().print(" # Error tests: "); + for (Iterator<String> it = errorTests.iterator(); it.hasNext();) + { + w.print(it.next()); + if (it.hasNext()) + w.print(", "); + } + } + } + catch (Exception e) + { + throw new ServletException(e); + } + } + + private void invokeMethod(Method m, ClientHelper helper, List<String> failedTests, List<String> errorTests) throws ServletException + { + try + { + if (!(Boolean)m.invoke(helper)) + { + failedTests.add(m.getName()); + } + } + catch (InvocationTargetException e) + { + Throwable thrownException = e.getTargetException(); + errorTests.add(m.getName() + ": " + thrownException.getClass().getName() + " " + thrownException.getMessage()); + thrownException.printStackTrace(); + } + catch (Exception e) + { + throw new ServletException(e); + } + } +} Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-09 13:26:25 UTC (rev 14327) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-09 13:43:04 UTC (rev 14328) @@ -637,13 +637,13 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</compilerArgument> + <compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</compilerArgument> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>  <additionalClasspathElements>  Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2011-05-09 13:26:25 UTC (rev 14327) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2011-05-09 13:43:04 UTC (rev 14328) @@ -87,24 +87,6 @@ </artifactItems> </configuration> </execution> - <execution>  - <id>copy-junit</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <type>jar</type> - <outputDirectory>${basedir}/target/junit-libs</outputDirectory> - <destFileName>junit.jar</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> </executions> </plugin> <plugin> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-05-09 13:26:25 UTC (rev 14327) +++ stack/cxf/trunk/pom.xml 2011-05-09 13:43:04 UTC (rev 14328) @@ -117,12 +117,14 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> <version>${jbossws.shared.testsuite.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> <version>${jbossws.shared.testsuite.version}</version> <type>zip</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -1173,14 +1175,25 @@ <artifactId>easymockclassextension</artifactId> <version>2.4</version> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <version>${jbossws.shared.testsuite.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <version>${jbossws.shared.testsuite.version}</version> + <type>zip</type> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement>

13 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2011