[jbossws-commits] JBossWS SVN: r8990 - in framework/trunk: testsuite/test/ant-import and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Jan 8 10:02:41 EST 2009
Author: alessio.soldano at jboss.com
Date: 2009-01-08 10:02:41 -0500 (Thu, 08 Jan 2009)
New Revision: 8990
Modified:
framework/trunk/pom.xml
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
Log:
[JBWS-2444] Updating tests + pom.xml for AS 6
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/pom.xml 2009-01-08 15:02:41 UTC (rev 8990)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.8.GA</jbossws.common.version>
+ <jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-01-08 15:02:41 UTC (rev 8990)
@@ -27,12 +27,12 @@
<condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
</condition>
- <condition property="jboss.home" value="${jboss501.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </condition>
<condition property="jboss.home" value="${jboss510.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</condition>
+ <condition property="jboss.home" value="${jboss600.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -114,7 +114,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss51,tests-classpath-jboss50,tests-classpath-jboss42">
+ <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50,tests-classpath-jboss42">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
@@ -345,6 +345,84 @@
<pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/>
</path>
</target>
+
+ <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60">
+
+ <path id="integration.target.javac.classpath">
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-appclient.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ </path>
+
+ <!--
+ The 's.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="integration.target.client.classpath">
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-appclient.jar"/>
+ <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss510.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/trove.jar"/>
+ <!-- FIXME jars should be available in the client dir -->
+ <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-container.jar"/>
+ <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
+ <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
+ <pathelement location="${tools.jar}"/>
+ <!-- WS-RM backports server dependencies -->
+ <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/>
+ <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/>
+ </path>
+ </target>
<!-- ================================================================== -->
<!-- Compiling -->
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -49,7 +49,7 @@
public static Test suite()
{
//here in the AS 5 jar we use <service-qname> that does not exist in AS 4.2.x
- return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
+ return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater()() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
}
protected void setUp() throws Exception
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -48,7 +48,7 @@
{
public static Test suite()
{
- String earName = (new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
+ String earName = (new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
return new JBossWSTestSetup(EarTestCase.class, earName);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
+ return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
}
private SecureEndpoint getPort() throws Exception
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -50,7 +50,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss5())
+ if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
archives += ",jaxws-samples-serviceref-client.jar";
return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -49,7 +49,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss5())
+ if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
archives += ",jaxws-samples-serviceref-ejb-client.jar";
return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2009-01-08 14:32:58 UTC (rev 8989)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2009-01-08 15:02:41 UTC (rev 8990)
@@ -47,7 +47,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss5())
+ if (new JBossWSTestHelper().isTargetJBoss5OrGreater())
archives += ",jaxws-samples-serviceref-servlet-client.war";
return new JBossWSTestSetup(ServiceRefServletTestCase.class, archives);
More information about the jbossws-commits
mailing list