[jbossws-commits] JBossWS SVN: r17289 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 8 11:06:37 EST 2013
Author: alessio.soldano at jboss.com
Date: 2013-02-08 11:06:37 -0500 (Fri, 08 Feb 2013)
New Revision: 17289
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Further changes related to AS7-6344 to fix binary distribution testsuite
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 15:48:20 UTC (rev 17288)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 16:06:37 UTC (rev 17289)
@@ -107,11 +107,6 @@
<property name="jboss.lib" value="${jboss.home}/lib"/>
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
- <isset property="jboss.home"/>
- </condition>
-
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -138,6 +133,11 @@
<target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x">
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
<path id="integration.target.javac.classpath">
<fileset dir="${jboss.home}/modules/javax/activation/api/main/">
<include name="activation-*.jar"/>
@@ -293,32 +293,37 @@
<target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
+ <!-- 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/javax/activation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/">
<include name="activation-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <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/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <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/org/jboss/ejb3/main/">
+ <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/javax/servlet/api/main/">
+ <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/javax/annotation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
<include name="jboss-annotations-api_1.1_spec-*.jar"/>
</fileset>
</path>
@@ -336,110 +341,110 @@
<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/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/">
+ <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/org/jboss/as/controller-client/main/">
+ <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/org/jboss/as/server/main/">
+ <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/org/jboss/as/protocol/main/">
+ <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/org/jboss/dmr/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/">
<include name="jboss-dmr-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/">
<include name="jboss-marshalling-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/">
<include name="slf4j-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/">
+ <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/org/slf4j/impl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/">
<include name="slf4j-jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/">
<include name="jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/log4j/main/">
<include name="log4j-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <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/javax/transaction/api/main/">
+ <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/org/jboss/threads/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
<include name="jboss-threads-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketbox/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/">
<include name="picketbox-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <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/org/jboss/ejb-client/main/">
+ <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/org/apache/xerces/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/">
<include name="xercesImpl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <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/org/javassist/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/">
<include name="javassist-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/">
+ <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/org/jboss/remoting3/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting3/main/">
<include name="jboss-remoting-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/">
+ <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/org/jboss/remoting-jmx/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/">
<include name="remoting-jmx-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
<include name="netty-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
<include name="jbossxb-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/joda/time/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/">
<include name="joda-time-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
+ <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/org/jboss/xnio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/">
<include name="xnio-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/">
<include name="xnio-nio-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/">
<include name="jboss-remote-naming-*.jar"/>
</fileset>
<pathelement location="${tools.jar}"/>
More information about the jbossws-commits
mailing list