July 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16492 - in stack/native/trunk: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 04:55:26 -0400 (Thu, 19 Jul 2012) New Revision: 16492 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3484] fixing AS 712 only - still waiting for pull request to be merged Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -63,7 +63,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -94,7 +94,7 @@ <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  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 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -48,7 +48,6 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -60,9 +59,9 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss*:jar</include> + <include>org.jboss.ws:jbossws-jboss712-server-integration:jar</include> </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss712.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -261,60 +261,9 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.3.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.10.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.3.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.7.GA</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -114,14 +114,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <version>${jbossws.jboss712.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <version>${jbossws.jboss712.version}</version> - <classifier>tests-integration</classifier> </dependency>  <dependency>

10 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 04:04:38 -0400 (Thu, 19 Jul 2012) New Revision: 16491 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3484] fixing test suite build.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-18 15:58:27 UTC (rev 16490) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-19 08:04:38 UTC (rev 16491) @@ -177,7 +177,7 @@ --> <path id="integration.target.client.classpath">  - <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  <pathelement location="${jboss.home}/jboss-modules.jar"/> @@ -329,7 +329,7 @@ --> <path id="integration.target.client.classpath">  - <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>  <pathelement location="${jboss.home}/jboss-modules.jar"/>

10 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 11:58:27 -0400 (Wed, 18 Jul 2012) New Revision: 16490 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: Removing native wsse sys props from bin dist testsuite runs, as those tests have been removed while putting native stack in EOL Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-18 15:57:23 UTC (rev 16489) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-18 15:58:27 UTC (rev 16490) @@ -603,12 +603,6 @@ <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> - <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> <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"/> @@ -663,12 +657,6 @@ <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> - <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> <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"/>

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16489 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 11:57:23 -0400 (Wed, 18 Jul 2012) New Revision: 16489 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Removing native wsse sys props from cxf testsuite run... Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 15:40:15 UTC (rev 16488) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 15:57:23 UTC (rev 16489) @@ -326,30 +326,6 @@ <value>${project.build.directory}/test-classes/test.keystore</value> </property> <property> - <name>org.jboss.ws.wsse.keyStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStoreType</name> - <value>jks</value> - </property> - <property> <name>test.archive.directory</name> <value>${test.archive.directory}</value> </property> @@ -450,30 +426,6 @@ <value>${project.build.directory}/test-classes/test.keystore</value> </property> <property> - <name>org.jboss.ws.wsse.keyStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStoreType</name> - <value>jks</value> - </property> - <property> <name>test.archive.directory</name> <value>${test.archive.directory}</value> </property>

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16488 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 11:40:15 -0400 (Wed, 18 Jul 2012) New Revision: 16488 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3446] Enabling tests for AS 7.1.1 Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 15:05:28 UTC (rev 16487) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 15:40:15 UTC (rev 16488) @@ -1000,10 +1000,6 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> @@ -1395,7 +1391,7 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> -  +  <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16487 - container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 11:05:28 -0400 (Wed, 18 Jul 2012) New Revision: 16487 Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java Log: [JBWS-3446] Adding methods to AS 7.1.1 CI RemoteDeployer Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java =================================================================== --- container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-07-18 14:33:20 UTC (rev 16486) +++ container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-07-18 15:05:28 UTC (rev 16487) @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Semaphore; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -47,12 +48,14 @@ import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; +import org.jboss.as.controller.operations.common.Util; import org.jboss.dmr.ModelNode; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployer.Deployer; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.COMPOSITE; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.FAILURE_DESCRIPTION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; @@ -65,6 +68,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS; import static org.jboss.as.security.Constants.AUTHENTICATION; @@ -98,6 +102,7 @@ private final ModelControllerClient modelControllerClient; private final Map<String, Integer> securityDomainUsers = new HashMap<String, Integer>(1); private final Map<String, Integer> archiveCounters = new HashMap<String, Integer>(); + private final Semaphore httpsConnSemaphore = new Semaphore(1); public RemoteDeployer() throws IOException { final String host = System.getProperty(JBWS_DEPLOYER_HOST); @@ -253,7 +258,44 @@ applyUpdate(op, getModelControllerClient()); } } + + @Override + public void addHttpsConnector(Map<String, String> sslOptions) throws Exception { + httpsConnSemaphore.acquire(); + try { + final ModelNode composite = Util.getEmptyOperation(COMPOSITE, new ModelNode()); + final ModelNode steps = composite.get(STEPS); + ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", ADD); + op.get("socket-binding").set("https"); + op.get("scheme").set("https"); + op.get("protocol").set("HTTP/1.1"); + op.get("secure").set(true); + op.get("enabled").set(true); + steps.add(op); + ModelNode ssl = createOpNode("subsystem=web/connector=jbws-test-https-connector/ssl=configuration", ADD); + if (sslOptions != null) { + for (final String k : sslOptions.keySet()) { + ssl.get(k).set(sslOptions.get(k)); + } + } + steps.add(ssl); + applyUpdate(composite, getModelControllerClient()); + } catch (Exception e) { + httpsConnSemaphore.release(); + throw e; + } + } + @Override + public void removeHttpsConnector() throws Exception { + try { + ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", REMOVE); + applyUpdate(op, getModelControllerClient()); + } finally { + httpsConnSemaphore.release(); + } + } + private ModelControllerClient getModelControllerClient() { return modelControllerClient; } @@ -313,6 +355,21 @@ } }; } + + public static ModelNode createOpNode(String address, String operation) { + ModelNode op = new ModelNode(); + // set address + ModelNode list = op.get("address").setEmptyList(); + if (address != null) { + String[] pathSegments = address.split("/"); + for (String segment : pathSegments) { + String[] elements = segment.split("="); + list.add(elements[0], elements[1]); + } + } + op.get("operation").set(operation); + return op; + } private static String getSystemProperty(final String name, final String defaultValue) { PrivilegedAction<String> action = new PrivilegedAction<String>() {

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16486 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/etc and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 10:33:20 -0400 (Wed, 18 Jul 2012) New Revision: 16486 Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.keystore stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.truststore stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.keystore stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.truststore Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/truststore_abc Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3446] set client sysprops, add and copy keystores, update testcases Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.keystore =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.keystore ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.truststore =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/test.truststore ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2012-07-18 14:29:30 UTC (rev 16485) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2012-07-18 14:33:20 UTC (rev 16486) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, 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. * @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.samples.wssePolicy; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -32,6 +34,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; /** * WS-Security Policy username test case @@ -45,10 +48,20 @@ public static Test suite() { - System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc"); + /** System properties - currently set at testsuite start time + System.setProperty("javax.net.ssl.trustStore", "my.truststore"); System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); System.setProperty("javax.net.ssl.trustStoreType", "jks"); - return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); + System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); + */ + JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); + Map<String, String> sslOptions = new HashMap<String, String>(); + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + setup.setHttpsConnectorRequirement(sslOptions); + return setup; } public void test() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.keystore =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.keystore ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.truststore =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/test.truststore ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2012-07-18 14:29:30 UTC (rev 16485) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2012-07-18 14:33:20 UTC (rev 16486) @@ -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. * @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.samples.wsse.policy.basic; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -32,6 +34,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; /** * WS-Security Policy username test case (using secure transport) @@ -45,12 +48,22 @@ public static Test suite() { - System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc"); + /** System properties - currently set at testsuite start time + System.setProperty("javax.net.ssl.trustStore", "my.truststore"); System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); System.setProperty("javax.net.ssl.trustStoreType", "jks"); - return new JBossWSCXFTestSetup(UsernameOverTransportTestCase.class, "jaxws-samples-wsse-policy-username.war"); + System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); + */ + JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameOverTransportTestCase.class, "jaxws-samples-wsse-policy-username.war"); + Map<String, String> sslOptions = new HashMap<String, String>(); + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + setup.setHttpsConnectorRequirement(sslOptions); + return setup; } - + public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); Modified: 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 2012-07-18 14:29:30 UTC (rev 16485) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2012-07-18 14:33:20 UTC (rev 16486) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, 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. * @@ -28,6 +28,10 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.JBossWSTestSetup; +/** + * + * @author alessio.soldano(a)jboss.com + */ public class JBossWSCXFTestSetup extends JBossWSTestSetup { private Bus defaultBus; @@ -51,6 +55,11 @@ { super(test, archiveList, requiresDefaultSecurityDomain); } + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain, CleanupOperation cleanupOp) + { + super(testClass, archiveList, requiresDefaultSecurityDomain, cleanupOp); + } public JBossWSCXFTestSetup(Test test) { Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/truststore_abc =================================================================== (Binary files differ) Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 14:29:30 UTC (rev 16485) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-18 14:33:20 UTC (rev 16486) @@ -129,7 +129,19 @@ <testResource> <directory>src/test/etc</directory> <filtering>true</filtering> + <excludes> + <exclude>*.keystore</exclude> + <exclude>*.truststore</exclude> + </excludes> </testResource> + <testResource> + <directory>src/test/etc</directory> + <filtering>false</filtering> + <includes> + <include>*.keystore</include> + <include>*.truststore</include> + </includes> + </testResource>  <testResource> <targetPath>../test-classes</targetPath> @@ -266,6 +278,22 @@ <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> </property> <property> + <name>javax.net.ssl.trustStore</name> + <value>${project.build.directory}/test-classes/test.truststore</value> + </property> + <property> + <name>javax.net.ssl.trustStorePassword</name> + <value>changeit</value> + </property> + <property> + <name>javax.net.ssl.trustStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.security.ignoreHttpsHost</name> + <value>true</value> + </property> + <property> <name>jboss.home</name> <value>${jboss.home}</value> </property> @@ -294,6 +322,10 @@ <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> </property> <property> + <name>org.jboss.ws.testsuite.server.keystore</name> + <value>${project.build.directory}/test-classes/test.keystore</value> + </property> + <property> <name>org.jboss.ws.wsse.keyStore</name> <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> </property> @@ -370,6 +402,22 @@ <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> </property> <property> + <name>javax.net.ssl.trustStore</name> + <value>${project.build.directory}/test-classes/test.truststore</value> + </property> + <property> + <name>javax.net.ssl.trustStorePassword</name> + <value>changeit</value> + </property> + <property> + <name>javax.net.ssl.trustStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.security.ignoreHttpsHost</name> + <value>true</value> + </property> + <property> <name>jboss.home</name> <value>${jboss.home}</value> </property> @@ -398,6 +446,10 @@ <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> </property> <property> + <name>org.jboss.ws.testsuite.server.keystore</name> + <value>${project.build.directory}/test-classes/test.keystore</value> + </property> + <property> <name>org.jboss.ws.wsse.keyStore</name> <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> </property>

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16485 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 10:29:30 -0400 (Wed, 18 Jul 2012) New Revision: 16485 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3446] Allow setting https connector requirement through JBossWSTestHelper/Setup + setting client sysprops and copying stores for bindist testsuite Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-07-18 14:26:55 UTC (rev 16484) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-07-18 14:29:30 UTC (rev 16485) @@ -357,4 +357,14 @@ { getDeployer().removeSecurityDomain(name); } + + public static void addHttpsConnector(Map<String, String> sslOptions) throws Exception + { + getDeployer().addHttpsConnector(sslOptions); + } + + public static void removeHttpsConnector() throws Exception + { + getDeployer().removeHttpsConnector(); + } } Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-07-18 14:26:55 UTC (rev 16484) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-07-18 14:29:30 UTC (rev 16485) @@ -64,6 +64,7 @@ private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains; private boolean defaultSecurityDomainRequirement = false; + private Map<String, String> httpsConnSslOptions; private CleanupOperation cleanupOp; public JBossWSTestSetup(Class<?> testClass, String archiveList) @@ -210,6 +211,9 @@ log.warn("Could not add default security domain!", e); } } + if (httpsConnSslOptions != null) { + JBossWSTestHelper.addHttpsConnector(httpsConnSslOptions); + } List<URL> clientJars = new ArrayList<URL>(); for (int i = 0; i < archives.length; i++) @@ -304,6 +308,10 @@ { JBossWSTestHelper.removeSecurityDomain(JBOSSWS_SEC_DOMAIN); } + if (httpsConnSslOptions != null) + { + JBossWSTestHelper.removeHttpsConnector(); + } } } @@ -329,4 +337,8 @@ { this.defaultSecurityDomainRequirement = defaultSecurityDomainRequirement; } + + public void setHttpsConnectorRequirement(Map<String, String> sslOptions) { + httpsConnSslOptions = sslOptions; + } } Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-18 14:26:55 UTC (rev 16484) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-07-18 14:29:30 UTC (rev 16485) @@ -476,6 +476,12 @@ <filter token="jboss.bind.address" value="${node0}"/> </filterset> </copy> + <copy todir="${tests.output.dir}/test-classes"> + <fileset dir="@{srcdir}/etc"> + <include name="*.keystore"/> + <include name="*.truststore"/> + </fileset> + </copy>  <copy todir="${tests.output.dir}/test-classes"> @@ -582,6 +588,10 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/test-classes/test.truststore"/> + <sysproperty key="javax.net.ssl.trustStorePassword" value="changeit"/> + <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> + <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> @@ -592,6 +602,7 @@ <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> + <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> @@ -637,6 +648,10 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/test-classes/test.truststore"/> + <sysproperty key="javax.net.ssl.trustStorePassword" value="changeit"/> + <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> + <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> @@ -645,19 +660,9 @@ <sysproperty key="jbossws.deployer.authentication.password" value="${jbossws.deployer.authentication.password}"/> <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> -  -  - <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/> <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/> + <sysproperty key="org.jboss.ws.testsuite.server.keystore" value="${tests.output.dir}/test-classes/test.keystore"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/> <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16484 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployer.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-07-18 10:26:55 -0400 (Wed, 18 Jul 2012) New Revision: 16484 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java Log: [JBWS-3446] Allow jbossws tests to install a test https connector on target server Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2012-07-18 13:21:30 UTC (rev 16483) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2012-07-18 14:26:55 UTC (rev 16484) @@ -57,4 +57,19 @@ * @param name */ void removeSecurityDomain(String name) throws Exception; + + /** + * Adds a test https connector + * + * @param sslOptions + * @throws Exception + */ + public void addHttpsConnector(Map<String, String> sslOptions) throws Exception; + + /** + * Remove the test https connector + * + * @throws Exception + */ + public void removeHttpsConnector() throws Exception; }

10 years, 10 months

1
0
0 / 0

JBossWS SVN: r16482 - in framework/branches/jbossws-framework-3.1.2/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-17 23:44:26 -0400 (Tue, 17 Jul 2012) New Revision: 16482 Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/WEB-INF/ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBPAPP-7112] Checking in test case Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2012-07-17 13:49:51 UTC (rev 16481) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2012-07-18 03:44:26 UTC (rev 16482) @@ -831,6 +831,14 @@ </classes> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2717.war" + webxml="${tests.output.dir}/test-resources/jaxws/jbws2717/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java 2012-07-18 03:44:26 UTC (rev 16482) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2717; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Endpoint implementation. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService (name="Endpoint", serviceName="EndpointService") +public class EndpointImpl +{ + @WebMethod + public String echo(final String s) + { + return s; + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java 2012-07-18 03:44:26 UTC (rev 16482) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2717; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2717] Send XML declarations with WSDL + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBWS2717TestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2717TestCase.class, "jaxws-jbws2717.war"); + } + + public void testXmlDeclarationInWSDL() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2717?wsdl"); + InputStream wsdlContent = wsdlURL.openStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + IOUtils.copyStream(baos, wsdlContent); + String wsdlAsText = new String(baos.toByteArray()); + assertTrue(wsdlAsText.startsWith("<?xml version")); + } + +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml 2012-07-18 03:44:26 UTC (rev 16482) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2717.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +

10 years, 10 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2012