10:02 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-02-20 11:02:00 -0500 (Wed, 20 Feb 2013)
New Revision: 17334
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3600] Adding jboss800 target, removing jboss711
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
---
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-02-20
14:23:32 UTC (rev 17333)
+++
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-02-20
16:02:00 UTC (rev 17334)
@@ -147,6 +147,18 @@
return target.startsWith("jboss72");
}
+ public static boolean isTargetJBoss8()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss8");
+ }
+
+ public static boolean isTargetJBoss80()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss80");
+ }
+
public static boolean isIntegrationNative()
{
String vendor = getImplementationVendor();
@@ -237,7 +249,7 @@
if (server == null)
{
String integrationTarget = getIntegrationTarget();
- if (integrationTarget.startsWith("jboss7"))
+ if (integrationTarget.startsWith("jboss7") ||
integrationTarget.startsWith("jboss8"))
{
server = getAS7ServerConnection(integrationTarget);
}
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-20
14:23:32 UTC (rev 17333)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-20
16:02:00 UTC (rev 17334)
@@ -31,9 +31,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss711.home}">
- <equals arg1="${jbossws.integration.target}"
arg2="jboss711"/>
- </condition>
<condition property="jboss.home" value="${jboss712.home}">
<equals arg1="${jbossws.integration.target}"
arg2="jboss712"/>
</condition>
@@ -43,6 +40,9 @@
<condition property="jboss.home" value="${jboss720.home}">
<equals arg1="${jbossws.integration.target}"
arg2="jboss720"/>
</condition>
+ <condition property="jboss.home" value="${jboss800.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss800"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported
-->
<fail message="Tests output dir not set."
unless="tests.output.dir"/>
@@ -120,7 +120,7 @@
</tstamp>
</target>
- <target name="tests-classpath"
depends="tests-classpath-jboss71x,tests-classpath-jboss72x">
+ <target name="tests-classpath"
depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-jboss80x">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -450,6 +450,166 @@
<pathelement location="${tools.jar}"/>
</path>
</target>
+
+ <target name="tests-classpath-jboss80x" depends="tests-prepare"
if="jbossws.integration.jboss80x">
+
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs"
value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
+ <path id="integration.target.javac.classpath">
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/">
+ <include name="activation-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
+ <include name="mail-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
+ <include name="jboss-common-core-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
+ <include name="jboss-logging-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
+ <include name="picketlink-core*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
+ <include name="jboss-ejb-api_3.1_spec-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/">
+ <include name="jboss-ejb3-ext-api-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
+ <include name="jboss-servlet-api_3.0_spec-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
+ <include name="jboss-annotations-api_1.1_spec-*.jar"/>
+ </fileset>
+ </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">
+ <!-- included from thirdparty local dir as it's not installed on AS - START
-->
+ <pathelement
location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
+ <pathelement
location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>
+ <!-- included from thirdparty local dir as it's not installed on AS - END
-->
+ <pathelement location="${jboss.home}/jboss-modules.jar"/>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
+ <include name="jboss-logging-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/">
+ <include name="jboss-as-controller-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/">
+ <include name="jboss-as-controller-client-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/">
+ <include name="jboss-as-server-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/">
+ <include name="jboss-as-protocol-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/">
+ <include name="jboss-dmr-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/">
+ <include name="jboss-marshalling-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/">
+ <include name="slf4j-api-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/">
+ <include name="jcl-over-slf4j-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/">
+ <include name="slf4j-jboss-logmanager-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/">
+ <include name="jboss-logmanager-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/apache/log4j/main/">
+ <include name="log4j-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
+ <include name="mail-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
+ <include name="jboss-servlet-api_3.0_spec-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
+ <include name="jboss-transaction-api_1.1_spec-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
+ <include name="jboss-threads-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/">
+ <include name="picketbox-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
+ <include name="picketlink-core*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
+ <include name="jboss-ejb-api_3.1_spec-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/">
+ <include name="jboss-ejb-client-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/">
+ <include name="xercesImpl-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
+ <include name="jboss-common-core-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/javassist/main/">
+ <include name="javassist-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/">
+ <include name="jboss-jacc-api*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting3/main/">
+ <include name="jboss-remoting-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/">
+ <include name="jboss-marshalling-river-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/">
+ <include name="remoting-jmx-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
+ <include name="jboss-sasl-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
+ <include name="netty-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
+ <include name="jbossxb-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/">
+ <include name="joda-time-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/">
+ <include name="serializer-*.jar"/>
+ <include name="xalan-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/">
+ <include name="xnio-api-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/">
+ <include name="xnio-nio-*.jar"/>
+ </fileset>
+ <fileset
dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/">
+ <include name="jboss-remote-naming-*.jar"/>
+ </fileset>
+ <pathelement location="${tools.jar}"/>
+ </path>
+ </target>
<!-- ================================================================== -->
<!-- Compiling -->