JBossWS SVN: r13854 - shared-testsuite/trunk/src/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 17:04:23 -0500 (Fri, 04 Mar 2011)
New Revision: 13854
Modified:
shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3238] changing wildcard for ant based testsuite
Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-04 22:01:22 UTC (rev 13853)
+++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-04 22:04:23 UTC (rev 13854)
@@ -435,7 +435,7 @@
<!-- Run all unit tests and generate a report -->
<target name="tests" depends="tests-jars" description="Run all unit tests and generate a report">
<antcall target="tests-run-internal">
- <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase*.class"/>
<param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
<param name="haltonfailure" value="false"/>
</antcall>
13 years, 9 months
JBossWS SVN: r13853 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 17:01:22 -0500 (Fri, 04 Mar 2011)
New Revision: 13853
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3238] Adding execution for tests requiring fork mode
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 22:00:29 UTC (rev 13852)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 22:01:22 UTC (rev 13853)
@@ -300,6 +300,97 @@
</systemProperties>
</configuration>
</execution>
+
+ <execution>
+ <id>forked-integration-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <skip>false</skip>
+ <includes>
+ <include>**/smoke/tools/**/*TestForked.java</include>
+ <include>**/smoke/tools/**/*TestCaseForked.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jboss.server.instance</name>
+ <value>${jboss.server.instance}</value>
+ </property>
+ <property>
+ <name>jboss.bind.address</name>
+ <value>${jboss.bind.address}</value>
+ </property>
+ <property>
+ <name>java.naming.provider.url</name>
+ <value>jnp://${jboss.bind.address}:1099</value>
+ </property>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>jbossws.integration.target</name>
+ <value>${jbossws.integration.target}</value>
+ </property>
+ <property>
+ <name>test.disable.deployment</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</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>
+ <property>
+ <name>test.classes.directory</name>
+ <value>${test.classes.directory}</value>
+ </property>
+ <property>
+ <name>test.resources.directory</name>
+ <value>${test.resources.directory}</value>
+ </property>
+ <property>
+ <name>wsdl.publish.location</name>
+ <value>${wsdl.publish.location}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
</plugins>
13 years, 9 months
JBossWS SVN: r13852 - shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 17:00:29 -0500 (Fri, 04 Mar 2011)
New Revision: 13852
Added:
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
Removed:
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
[JBWS-3238] Renaming tests
Deleted: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2011-03-04 15:42:59 UTC (rev 13851)
+++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2011-03-04 22:00:29 UTC (rev 13852)
@@ -1,186 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.smoke.tools;
-
-/**
- * Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be executed below 'output/tests'.
- *
- * @author Heiko.Braun(a)jboss.com
- * @author alessio.soldano(a)jboss.com
- */
-public class WSConsumerTestCase extends PluginBase implements WSConsumerPluginDelegate
-{
-
- /**
- * Recreates a tools delegate for every test
- * @throws Exception
- */
- protected void setUp() throws Exception
- {
-
- // JBWS-2175
- setupClasspath();
-
- Class<?> wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
- setDelegate(wscClass);
- }
-
-
- protected void tearDown() throws Exception
- {
- restoreClasspath();
- }
-
- /**
- * Specifies the JAX-WS and JAXB binding files to use on import operations.
- * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html
- */
- public void testBindingFiles() throws Exception
- {
- dispatch("testBindingFiles");
-
- }
-
- /**
- * Sets the OASIS XML Catalog file to use for entity resolution.
- *
- */
- public void testCatalog() throws Exception
- {
- dispatch("testCatalog");
- }
-
- /**
- * Sets the main output directory. If the directory does not exist, it will be created. org.jboss.test.ws.jaxws.smoke.tools
- *
- */
- public void testOutputDirectory() throws Exception
- {
- dispatch("testOutputDirectory");
- }
-
- /**
- * Sets the source directory. This directory will contain any generated Java source.
- * If the directory does not exist, it will be created. If not specified,
- * the output directory will be used instead.
- *
- */
- public void testSourceDirectory() throws Exception
- {
- dispatch("testSourceDirectory");
- }
-
-
- /**
- *JBWS-3193
- * If there are "-n" and "-s" flag, without "-k", the generated
- * artifacts should be placed in output directory
- */
- public void testNocompileNoKeep() throws Exception
- {
- dispatch("testNocompileNoKeep");
- }
-
- /**
- * Enables/Disables Java source generation.
- *
- */
- public void testGenerateSource() throws Exception
- {
- testTargetPackage();
- }
-
- /**
- * Sets the target package for generated source. If not specified the default
- * is based off of the XML namespace.
- *
- */
- public void testTargetPackage() throws Exception
- {
- dispatch("testTargetPackage");
- }
-
- /**
- * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value.
- *
- */
- public void testWsdlLocation() throws Exception
- {
- dispatch("testWsdlLocation");
- }
-
- /**
- * Sets the PrintStream to use for status feedback.
- * The simplest example would be to use System.out.
- */
- public void testMessageStream() throws Exception
- {
- dispatch("testMessageStream");
- }
-
- /**
- * Sets the additional classpath to use if/when invoking the Java compiler.
- * Typically an implementation will use the system <code>java.class.path</code>
- * property. So for most normal applications this method is not needed. However,
- * if this API is being used from an isolated classloader, then it needs to
- * be called in order to reference all jars that are required by the
- * implementation.
- *
- */
- public void testAdditionalCompilerClassPath()
- {
- // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task
- // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested.
- }
-
- /**
- * Set the target JAX-WS specification target. Defaults to <code>2.0</code>
- */
- public void testTarget() throws Exception
- {
- dispatch("testTarget");
-
- }
-
- /**
- * Tests the SOAP 1.2 binding extension
- *
- */
- public void testSOAP12Extension() throws Exception
- {
- dispatch("testSOAP12Extension");
- }
-
- /**
- * Test the implicit header generation support
- */
- public void testAdditionalHeaders() throws Exception
- {
- dispatch("testAdditionalHeaders");
- }
-
- protected boolean filtered(String jarName)
- {
- return false;
- }
-}
Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
===================================================================
--- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java (rev 0)
+++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2011-03-04 22:00:29 UTC (rev 13852)
@@ -0,0 +1,186 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.smoke.tools;
+
+/**
+ * Test the WSContractConsumer API across different implementations.
+ * NOTE: All tests expect to be executed below 'output/tests'.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WSConsumerTestCaseForked extends PluginBase implements WSConsumerPluginDelegate
+{
+
+ /**
+ * Recreates a tools delegate for every test
+ * @throws Exception
+ */
+ protected void setUp() throws Exception
+ {
+
+ // JBWS-2175
+ setupClasspath();
+
+ Class<?> wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
+ setDelegate(wscClass);
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ restoreClasspath();
+ }
+
+ /**
+ * Specifies the JAX-WS and JAXB binding files to use on import operations.
+ * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html
+ */
+ public void testBindingFiles() throws Exception
+ {
+ dispatch("testBindingFiles");
+
+ }
+
+ /**
+ * Sets the OASIS XML Catalog file to use for entity resolution.
+ *
+ */
+ public void testCatalog() throws Exception
+ {
+ dispatch("testCatalog");
+ }
+
+ /**
+ * Sets the main output directory. If the directory does not exist, it will be created. org.jboss.test.ws.jaxws.smoke.tools
+ *
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ dispatch("testOutputDirectory");
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ dispatch("testSourceDirectory");
+ }
+
+
+ /**
+ *JBWS-3193
+ * If there are "-n" and "-s" flag, without "-k", the generated
+ * artifacts should be placed in output directory
+ */
+ public void testNocompileNoKeep() throws Exception
+ {
+ dispatch("testNocompileNoKeep");
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ testTargetPackage();
+ }
+
+ /**
+ * Sets the target package for generated source. If not specified the default
+ * is based off of the XML namespace.
+ *
+ */
+ public void testTargetPackage() throws Exception
+ {
+ dispatch("testTargetPackage");
+ }
+
+ /**
+ * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value.
+ *
+ */
+ public void testWsdlLocation() throws Exception
+ {
+ dispatch("testWsdlLocation");
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback.
+ * The simplest example would be to use System.out.
+ */
+ public void testMessageStream() throws Exception
+ {
+ dispatch("testMessageStream");
+ }
+
+ /**
+ * Sets the additional classpath to use if/when invoking the Java compiler.
+ * Typically an implementation will use the system <code>java.class.path</code>
+ * property. So for most normal applications this method is not needed. However,
+ * if this API is being used from an isolated classloader, then it needs to
+ * be called in order to reference all jars that are required by the
+ * implementation.
+ *
+ */
+ public void testAdditionalCompilerClassPath()
+ {
+ // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task
+ // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested.
+ }
+
+ /**
+ * Set the target JAX-WS specification target. Defaults to <code>2.0</code>
+ */
+ public void testTarget() throws Exception
+ {
+ dispatch("testTarget");
+
+ }
+
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ dispatch("testSOAP12Extension");
+ }
+
+ /**
+ * Test the implicit header generation support
+ */
+ public void testAdditionalHeaders() throws Exception
+ {
+ dispatch("testAdditionalHeaders");
+ }
+
+ protected boolean filtered(String jarName)
+ {
+ return false;
+ }
+}
Deleted: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-03-04 15:42:59 UTC (rev 13851)
+++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-03-04 22:00:29 UTC (rev 13852)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.smoke.tools;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- */
-public class WSProviderTestCase extends PluginBase implements WSProviderPluginDelegate
-{
- /**
- * Recreates a tools delegate for every test
- * @throws Exception
- */
- protected void setUp() throws Exception
- {
-
- setupClasspath();
-
- Class<?> wspClass = Thread.currentThread().getContextClassLoader()
- .loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin");
- setDelegate(wspClass);
- }
-
-
- protected void tearDown() throws Exception
- {
- restoreClasspath();
- }
-
- public void testGenerateWsdl() throws Exception
- {
- dispatch("testGenerateWsdl");
- }
-
- public void testGenerateWsdlWithExtension() throws Exception
- {
- dispatch("testGenerateWsdlWithExtension");
- }
-
- public void testGenerateSource() throws Exception
- {
- dispatch("testGenerateSource");
- }
-
- public void testOutputDirectory() throws Exception
- {
- dispatch("testOutputDirectory");
- }
-
- public void testResourceDirectory() throws Exception
- {
- dispatch("testResourceDirectory");
- }
-
- public void testSourceDirectory() throws Exception
- {
- dispatch("testSourceDirectory");
- }
-
- public void testClassLoader() throws Exception
- {
- dispatch("testClassLoader");
- }
-
- public void testMessageStream() throws Exception
- {
- dispatch("testMessageStream");
- }
-
- /**
- * Filter sun jaxws implementation because it clashes
- * with the native one (ServiceLoader...)
- * @param jarName
- * @return
- */
- protected boolean filtered(String jarName)
- {
- return (isIntegrationNative() &&
- (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1)
- );
- }
-}
Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
===================================================================
--- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java (rev 0)
+++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2011-03-04 22:00:29 UTC (rev 13852)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.smoke.tools;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+public class WSProviderTestCaseForked extends PluginBase implements WSProviderPluginDelegate
+{
+ /**
+ * Recreates a tools delegate for every test
+ * @throws Exception
+ */
+ protected void setUp() throws Exception
+ {
+
+ setupClasspath();
+
+ Class<?> wspClass = Thread.currentThread().getContextClassLoader()
+ .loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin");
+ setDelegate(wspClass);
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ restoreClasspath();
+ }
+
+ public void testGenerateWsdl() throws Exception
+ {
+ dispatch("testGenerateWsdl");
+ }
+
+ public void testGenerateWsdlWithExtension() throws Exception
+ {
+ dispatch("testGenerateWsdlWithExtension");
+ }
+
+ public void testGenerateSource() throws Exception
+ {
+ dispatch("testGenerateSource");
+ }
+
+ public void testOutputDirectory() throws Exception
+ {
+ dispatch("testOutputDirectory");
+ }
+
+ public void testResourceDirectory() throws Exception
+ {
+ dispatch("testResourceDirectory");
+ }
+
+ public void testSourceDirectory() throws Exception
+ {
+ dispatch("testSourceDirectory");
+ }
+
+ public void testClassLoader() throws Exception
+ {
+ dispatch("testClassLoader");
+ }
+
+ public void testMessageStream() throws Exception
+ {
+ dispatch("testMessageStream");
+ }
+
+ /**
+ * Filter sun jaxws implementation because it clashes
+ * with the native one (ServiceLoader...)
+ * @param jarName
+ * @return
+ */
+ protected boolean filtered(String jarName)
+ {
+ return (isIntegrationNative() &&
+ (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1)
+ );
+ }
+}
13 years, 9 months
JBossWS SVN: r13851 - in stack/native/branches/ropalka/modules: resources/src/main/resources/modules/javax and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-04 10:42:59 -0500 (Fri, 04 Mar 2011)
New Revision: 13851
Added:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/ropalka/modules/testsuite/pom.xml
Log:
[JBWS-3206] server side classpath fixes (WIP)
Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml (rev 0)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml 2011-03-04 15:42:59 UTC (rev 13851)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="javax.xml.rpc.api">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+</module>
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-04 13:42:36 UTC (rev 13850)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-04 15:42:59 UTC (rev 13851)
@@ -32,9 +32,13 @@
<module name="javax.api" />
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
+ <module name="javax.mail.api" />
<module name="javax.xml.bind.api" />
<module name="javax.xml.stream.api" />
+ <module name="javax.xml.rpc.api" />
<module name="javax.xml.ws.api" />
+ <module name="org.apache.xerces" />
+ <module name="org.javassist" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-04 13:42:36 UTC (rev 13850)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-04 15:42:59 UTC (rev 13851)
@@ -309,6 +309,11 @@
<include name="**/jbossws-api.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/javax/xml/rpc/api/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jaxrpc-api.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-common.jar"/>
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 13:42:36 UTC (rev 13850)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 15:42:59 UTC (rev 13851)
@@ -740,6 +740,7 @@
<!-- ////////////////////////// -->
<!--# not yet supported on AS7 -->
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
13 years, 9 months
JBossWS SVN: r13850 - stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-04 08:42:36 -0500 (Fri, 04 Mar 2011)
New Revision: 13850
Removed:
stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
Log:
removing InvocationHandlerFactory setup - ASIL specific thing - from Native stack
Deleted: stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2011-03-04 12:03:28 UTC (rev 13849)
+++ stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2011-03-04 13:42:36 UTC (rev 13850)
@@ -1 +0,0 @@
-org.jboss.webservices.integration.invocation.InvocationHandlerFactoryImpl
\ No newline at end of file
13 years, 9 months
JBossWS SVN: r13849 - in stack/native/branches/ropalka: modules/client and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-04 07:03:28 -0500 (Fri, 04 Mar 2011)
New Revision: 13849
Modified:
stack/native/branches/ropalka/modules/client/pom.xml
stack/native/branches/ropalka/modules/core/pom.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/branches/ropalka/modules/testsuite/pom.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
stack/native/branches/ropalka/pom.xml
Log:
[JBWS-3206] updating excludes, fixing tools endorsement issue, disabling JAX-RPC tests
Modified: stack/native/branches/ropalka/modules/client/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/client/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/client/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -36,12 +36,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
<build>
Modified: stack/native/branches/ropalka/modules/core/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/core/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -16,7 +16,6 @@
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
- <jboss.jbossxb.version>2.0.1.GA</jboss.jbossxb.version>
</properties>
<!-- Dependencies -->
@@ -82,9 +81,13 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<scope>provided</scope>
- <version>${jboss.jbossxb.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>provided</scope>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -56,6 +56,7 @@
<property name="project.version" value="${project.version}" />
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
@@ -75,6 +76,7 @@
<property name="jboss.bind.address" value="${jboss.bind.address}" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="jaxrpc.enabled" value="${jaxrpc.enabled}"/>
<ant antfile="scripts/antrun-wstools.xml" target="wstools" />
</tasks>
</configuration>
@@ -93,6 +95,7 @@
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" />
</tasks>
</configuration>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
package="org.jboss.test.ws.benchmark.jaxws.doclit"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -29,6 +30,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -38,6 +40,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -47,6 +50,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -56,6 +60,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -65,6 +70,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -74,6 +80,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurity"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -89,6 +96,7 @@
<attribute name="jbossHome"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
+ <attribute name="javaEndorsedDirs"/>
<sequential>
<wsconsume
@@ -102,7 +110,7 @@
target="2.2"
fork="true"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsconsume>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
<wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"
destDir=""
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
@@ -30,6 +31,7 @@
<wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"
destDir=""
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
@@ -48,6 +50,7 @@
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
<attribute name="resourcesDir"/>
+ <attribute name="javaEndorsedDirs"/>
<sequential>
<wsprovide
@@ -61,7 +64,7 @@
resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
sourcedestdir="@{outputDir}/test-sources/@{resourcesDir}"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsprovide>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -7,23 +7,31 @@
<!-- ============================================================ -->
<project>
-
+
<!-- ================================================================== -->
<!-- Generating sources -->
<!-- ================================================================== -->
-
- <target name="wstools" depends="generate-sources,compile-sources,copy-resources" description="Generate the JAX-RPC artifacts.">
+
+ <target name="wstools" description="Generate the JAX-RPC artifacts.">
+ <condition property="generate.jaxrpc.artifacts" value="true">
+ <and>
+ <equals arg1="${jaxrpc.enabled}" arg2="true"/>
+ </and>
+ </condition>
+ <antcall target="generate-sources"/>
+ <antcall target="compile-sources"/>
+ <antcall target="copy-resources"/>
</target>
-
+
<!-- Generate JAX-RPC artifacts -->
- <target name="generate-sources">
-
+ <target name="generate-sources" if="generate.jaxrpc.artifacts">
+
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
<pathelement path="${maven.test.classpath}"/>
</classpath>
</taskdef>
-
+
<macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/>
@@ -42,12 +50,12 @@
<macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/>
-
+
</target>
-
+
<!-- Copy generated resources -->
- <target name="compile-sources">
-
+ <target name="compile-sources" if="generate.jaxrpc.artifacts">
+
<mkdir dir="${tests.output.dir}/wstools/java"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
@@ -58,7 +66,7 @@
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/>
</move>
-
+
<!--
Cannot run javac from tasks
http://jira.codehaus.org/browse/MANTRUN-91
@@ -71,17 +79,17 @@
</classpath>
</javac>
</target>
-
+
<!-- Copy generated resources -->
- <target name="copy-resources">
-
+ <target name="copy-resources" if="generate.jaxrpc.artifacts">
+
<copy todir="${tests.output.dir}/test-resources">
<fileset dir="${tests.output.dir}/wstools/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
</copy>
-
+
<copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true">
<fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
<filterset>
@@ -89,8 +97,8 @@
</filterset>
</copy>
</target>
-
- <!-- macro-wstools -->
+
+ <!-- macro-wstools -->
<macrodef name="macro-wstools">
<attribute name="dest"/>
<attribute name="config"/>
@@ -100,5 +108,5 @@
</wstools>
</sequential>
</macrodef>
-
+
</project>
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -63,6 +63,11 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -138,6 +143,35 @@
</testResource>
</testResources>
<plugins>
+ <plugin> <!-- This copies jboss-jaxws-api_2.2_spec & jboss-jaxb-api_2.2_spec jars to endorsed dir before the integration-tests are run -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run -->
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -154,6 +188,7 @@
<directory>${basedir}/../endorsed/target/</directory>
<includes>
<include>jbossws-native-factories-${project.version}.jar</include>
+ <include>jboss-jaxb-api_2.2_spec-${jaxb.api.version}.jar</include>
</includes>
</resource>
</resources>
@@ -368,6 +403,8 @@
<properties>
<jboss.version>6.0.0.Final</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
+ <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>true</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -503,6 +540,8 @@
<properties>
<jboss.version>6.0.1-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss601</jbossws.integration.target>
+ <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>true</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -619,6 +658,8 @@
<properties>
<jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
+ <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>false</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -638,13 +679,11 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -663,8 +702,11 @@
<testExcludes>
<!-- AS7 compilation excludes -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
@@ -699,8 +741,11 @@
<!--# not yet supported on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -124,6 +124,7 @@
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
</configuration>
@@ -141,6 +142,7 @@
<property name="project.version" value="${project.version}" />
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
<ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" />
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
package="org.jboss.test.ws.jaxws.complex"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -29,6 +30,7 @@
wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
package="org.jboss.test.ws.jaxws.holder"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -42,6 +44,7 @@
<attribute name="package"/>
<attribute name="outputDir"/>
<attribute name="jbossHome"/>
+ <attribute name="javaEndorsedDirs"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
@@ -57,7 +60,7 @@
target="2.2"
fork="true"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsconsume>
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
destdir="jaxws/jbws2960"
jbossHome="${jboss.home}"
+ javaEndorsedDirs="${endorsed.dirs}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -33,6 +34,7 @@
<attribute name="sei"/>
<attribute name="destDir"/>
<attribute name="jbossHome"/>
+ <attribute name="javaEndorsedDirs"/>
<attribute name="outputDir"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
@@ -48,7 +50,7 @@
destdir="@{outputDir}/test-classes/@{destDir}"
resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsprovide>
Modified: stack/native/branches/ropalka/pom.xml
===================================================================
--- stack/native/branches/ropalka/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -65,7 +65,7 @@
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
- <jboss.logging.version>2.2.0.CR1</jboss.logging.version>
+ <jboss.logging.version>3.0.0.Beta3</jboss.logging.version>
<jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
@@ -78,6 +78,7 @@
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
<xerces.version>2.9.1</xerces.version>
+ <jbossxb.version>2.0.3.GA</jbossxb.version>
<junit.version>3.8.1</junit.version>
</properties>
@@ -167,13 +168,18 @@
<artifactId>jboss-common-core</artifactId>
<version>${jboss.common.core.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
-
<!-- transitive dependencies -->
<dependency>
<groupId>commons-logging</groupId>
@@ -320,15 +326,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- </dependency>
- <dependency>
<groupId>ws-commons</groupId>
<artifactId>policy</artifactId>
<version>${wscommons.policy.version}</version>
@@ -358,6 +359,37 @@
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>junit</groupId>
13 years, 9 months
JBossWS SVN: r13848 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 10 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 03:50:51 -0500 (Fri, 04 Mar 2011)
New Revision: 13848
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
- Converting jbws3098 and gzip cxf testcases to using pojo endpoints instead of ejb3 ones, to start having test coverage on AS7 (it does not really matter what kind of endpoint is used here, but the tests are pretty much significant from a CXF integration point of view)
- Added a pojo endpoint version of the jbws3060 testcase, which should have been done in any case since the beginning (the test acts as load tests too)
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-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -71,11 +71,11 @@
</war>
<!-- jaxws-cxf-gzip -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.jar">
- <fileset dir="${tests.output.dir}/test-classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/gzip/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld*.class"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<!-- jaxws-cxf-jaxbintros -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar">
@@ -96,13 +96,19 @@
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
</fileset>
</jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
+ </classes>
+ </war>
<!-- jaxws-cxf-jbws3098 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3098.jar">
- <fileset dir="${tests.output.dir}/test-classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3098.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3098/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.class"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -61,7 +61,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.jar");
+ return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.war");
}
public void testGZIPUsingFeatureOnBus() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/HelloWorldImpl.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.gzip;
-import javax.ejb.Stateless;
import javax.jws.WebService;
import org.apache.cxf.annotations.GZIP;
@@ -33,7 +32,6 @@
targetNamespace = "http://org.jboss.ws/jaxws/cxf/gzip"
)
@GZIP(threshold = 0)
-@Stateless
public class HelloWorldImpl implements HelloWorld
{
public String echo(String input)
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,39 @@
+/*
+ * 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.test.ws.jaxws.cxf.jbws3060;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060EJB3TestCase extends JBWS3060Tests
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, "jaxws-cxf-jbws3060.jar");
+ }
+}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.ws.jaxws.cxf.jbws3060;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public class JBWS3060ServletTestCase extends JBWS3060Tests
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ System.out.println("FIXME: JBWS3060ServletTestCase temporarly running with limited concurrency, investigate load issue.");
+ this.defaultSize = 10;
+ }
+
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -1,171 +0,0 @@
-/*
- * 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.test.ws.jaxws.cxf.jbws3060;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 11-Jun-2010
- */
-public class JBWS3060TestCase extends JBossWSTest
-{
- private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
- private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
-
- private EndpointOne portOne;
- private EndpointTwo portTwo;
-
- public static Test suite()
- {
- return new JBossWSCXFTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar");
- }
-
- public void testAccess() throws Exception
- {
- initPorts();
- int count1 = portOne.getCount();
- int count2 = portTwo.getCount();
- Object retObj = portOne.echo("Hello");
- assertEquals("Hello", retObj);
- retObj = portTwo.sayHello("John");
- assertEquals("Hi John", retObj);
- assertEquals(1, portOne.getCount() - count1);
- assertEquals(1, portTwo.getCount() - count2);
- }
-
- public void testConcurrentInvocations() throws Exception
- {
- runConcurrentTests(false);
- }
-
- public void testConcurrentOneWayInvocations() throws Exception
- {
- runConcurrentTests(true);
- }
-
- private void runConcurrentTests(boolean oneway) throws Exception
- {
- initPorts();
- final int size = 30;
- int count1 = portOne.getCount();
- int count2 = portTwo.getCount();
- ExecutorService es = Executors.newFixedThreadPool(size*2);
- List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
- for (int i = 0; i < size; i++)
- {
- callables.add(new CallableOne(portOne, oneway));
- callables.add(new CallableTwo(portTwo, oneway));
- }
- List<Future<Boolean>> futures = es.invokeAll(callables);
- for (Future<Boolean> f : futures)
- {
- assertTrue(f.get());
- }
- assertEquals(size, portOne.getCount() - count1);
- assertEquals(size, portTwo.getCount() - count2);
- }
-
- private void initPorts() throws MalformedURLException
- {
- URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
- QName serviceOneName = new QName(targetNS, "ServiceOne");
- Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
-
- URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
- QName serviceTwoName = new QName(targetNS, "ServiceTwo");
- Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
- portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);
- }
-
- private static class CallableOne implements Callable<Boolean>
- {
- private EndpointOne port;
- private boolean oneway;
-
- public CallableOne(EndpointOne port, boolean oneway)
- {
- this.port = port;
- this.oneway = oneway;
- }
-
- public Boolean call() throws Exception
- {
- String arg = "Foo";
- if (oneway)
- {
- port.echoOneWay(arg);
- return true;
- }
- else
- {
- String result = port.echo(arg);
- return arg.equals(result);
- }
- }
- }
-
- private static class CallableTwo implements Callable<Boolean>
- {
- private EndpointTwo port;
- private boolean oneway;
-
- public CallableTwo(EndpointTwo port, boolean oneway)
- {
- this.port = port;
- this.oneway = oneway;
- }
-
- public Boolean call() throws Exception
- {
- String arg = "John";
- if (oneway)
- {
- port.sayHelloOneWay(arg);
- return true;
- }
- else
- {
- String result = port.sayHello(arg);
- return ("Hi " + arg).equals(result);
- }
- }
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,165 @@
+/*
+ * 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.test.ws.jaxws.cxf.jbws3060;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Jun-2010
+ */
+public abstract class JBWS3060Tests extends JBossWSTest //*Tests does not match the configured surefire filter on test classes' names
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne";
+ private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060";
+
+ private EndpointOne portOne;
+ private EndpointTwo portTwo;
+
+ protected int defaultSize = 30;
+
+ public void testAccess() throws Exception
+ {
+ initPorts();
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ retObj = portTwo.sayHello("John");
+ assertEquals("Hi John", retObj);
+ assertEquals(1, portOne.getCount() - count1);
+ assertEquals(1, portTwo.getCount() - count2);
+ }
+
+ public void testConcurrentInvocations() throws Exception
+ {
+ runConcurrentTests(false);
+ }
+
+ public void testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPorts();
+ final int size = defaultSize;
+ int count1 = portOne.getCount();
+ int count2 = portTwo.getCount();
+ ExecutorService es = Executors.newFixedThreadPool(size*2);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
+ for (int i = 0; i < size; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway));
+ callables.add(new CallableTwo(portTwo, oneway));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ assertEquals(size, portOne.getCount() - count1);
+ assertEquals(size, portTwo.getCount() - count2);
+ }
+
+ private void initPorts() throws MalformedURLException
+ {
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+
+ URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl");
+ QName serviceTwoName = new QName(targetNS, "ServiceTwo");
+ Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName);
+ portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+ private boolean oneway;
+
+ public CallableOne(EndpointOne port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo";
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+ private static class CallableTwo implements Callable<Boolean>
+ {
+ private EndpointTwo port;
+ private boolean oneway;
+
+ public CallableTwo(EndpointTwo port, boolean oneway)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "John";
+ if (oneway)
+ {
+ port.sayHelloOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.sayHello(arg);
+ return ("Hi " + arg).equals(result);
+ }
+ }
+ }
+}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.jar");
+ return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.war");
}
public void testClientLifeCycleManager()
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.java 2011-03-04 08:50:51 UTC (rev 13848)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3098;
-import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@@ -30,7 +29,6 @@
@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3098", serviceName = "ServiceOne")
@SOAPBinding(style = SOAPBinding.Style.RPC)
-@Stateless
public class EndpointOneImpl
{
@WebMethod
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.cxf.gzip.HelloWorldImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/HelloWorldService/HelloWorldImpl</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.gzip.HelloWorldImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/HelloWorldService/HelloWorldImpl</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>Ep1Servlet</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>Ep2Servlet</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Ep1Servlet</servlet-name>
- <url-pattern>/ServiceOne/EndpointOne</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Ep2Servlet</servlet-name>
- <url-pattern>/ServiceTwo/EndpointTwo</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3060/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Ep1Servlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Ep2Servlet</servlet-name>
+ <url-pattern>/ServiceTwo/EndpointTwo</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml 2011-03-02 21:33:18 UTC (rev 13833)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>EpServlet</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>EpServlet</servlet-name>
- <url-pattern>/ServiceOne/EndpointOne</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml (from rev 13833, stack/cxf/branches/JBWS-3236/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3098/WEB-INF/web.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>EpServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EpServlet</servlet-name>
+ <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:42:01 UTC (rev 13847)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
@@ -876,10 +876,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
13 years, 9 months
JBossWS SVN: r13847 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 03:42:01 -0500 (Fri, 04 Mar 2011)
New Revision: 13847
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3231] Enabling passing test (at least w/ Maven 2)
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:39:19 UTC (rev 13846)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:42:01 UTC (rev 13847)
@@ -911,9 +911,6 @@
<!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
<exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
- <!-- # [JBWS-3231] not satisfied policy alternatives -->
- <exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</exclude>
-
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
13 years, 9 months
JBossWS SVN: r13846 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 03:39:19 -0500 (Fri, 04 Mar 2011)
New Revision: 13846
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3230] Enabling passing test (at least w/ Maven 2)
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:37:28 UTC (rev 13845)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:39:19 UTC (rev 13846)
@@ -911,9 +911,6 @@
<!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
<exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
- <!-- # [JBWS-3230] WS RM namespace issue -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase*</exclude>
-
<!-- # [JBWS-3231] not satisfied policy alternatives -->
<exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</exclude>
13 years, 9 months
JBossWS SVN: r13845 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-04 03:37:28 -0500 (Fri, 04 Mar 2011)
New Revision: 13845
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3236] Update excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:35:27 UTC (rev 13844)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-04 08:37:28 UTC (rev 13845)
@@ -875,7 +875,7 @@
<exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/bus/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
@@ -895,9 +895,6 @@
<exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
- <!-- # [JBWS-3236] Ensure JBossWSBusFactory is built properly on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/endorse/**</exclude>
-
<!-- # [JBWS-3225] jbossws console not yet available -->
<exclude>org/jboss/test/ws/console/**</exclude>
13 years, 9 months