[jbossws-commits] JBossWS SVN: r16248 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu May 10 08:33:06 EDT 2012
Author: ropalka
Date: 2012-05-10 08:33:05 -0400 (Thu, 10 May 2012)
New Revision: 16248
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
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-3494] implementing AS720 support, dropping AS70x support
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-05-10 12:28:50 UTC (rev 16247)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-05-10 12:33:05 UTC (rev 16248)
@@ -207,14 +207,14 @@
return JBossWSTestHelper.isTargetJBoss7();
}
- public static boolean isTargetJBoss70()
+ public static boolean isTargetJBoss71()
{
- return JBossWSTestHelper.isTargetJBoss70();
+ return JBossWSTestHelper.isTargetJBoss71();
}
- public static boolean isTargetJBoss71()
+ public static boolean isTargetJBoss72()
{
- return JBossWSTestHelper.isTargetJBoss71();
+ return JBossWSTestHelper.isTargetJBoss72();
}
public static boolean isIntegrationNative()
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-05-10 12:28:50 UTC (rev 16247)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-05-10 12:33:05 UTC (rev 16248)
@@ -135,16 +135,16 @@
return target.startsWith("jboss7");
}
- public static boolean isTargetJBoss70()
+ public static boolean isTargetJBoss71()
{
String target = getIntegrationTarget();
- return target.startsWith("jboss70");
+ return target.startsWith("jboss71");
}
- public static boolean isTargetJBoss71()
+ public static boolean isTargetJBoss72()
{
String target = getIntegrationTarget();
- return target.startsWith("jboss71");
+ return target.startsWith("jboss72");
}
public static boolean isIntegrationNative()
@@ -252,12 +252,7 @@
private static MBeanServerConnection getAS7ServerConnection(String integrationTarget)
{
String host = getServerHost();
- String urlString;
- if (integrationTarget.startsWith("jboss70")) {
- urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi");
- } else {
- urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999);
- }
+ String urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999);
try {
JMXServiceURL serviceURL = new JMXServiceURL(urlString);
return JMXConnectorFactory.connect(serviceURL, null).getMBeanServerConnection();
@@ -274,8 +269,6 @@
if (integrationTarget == null)
throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_JBOSSWS_INTEGRATION_TARGET);
-
- LOGGER.warn("TODO: [JBWS-3211] implement integrationTarget mismatch check for AS 7.x");
}
return integrationTarget;
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-10 12:28:50 UTC (rev 16247)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-10 12:33:05 UTC (rev 16248)
@@ -31,12 +31,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss701.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss701"/>
- </condition>
- <condition property="jboss.home" value="${jboss702.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss702"/>
- </condition>
<condition property="jboss.home" value="${jboss710.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
</condition>
@@ -46,6 +40,9 @@
<condition property="jboss.home" value="${jboss712.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
</condition>
+ <condition property="jboss.home" value="${jboss720.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss720"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -128,7 +125,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700">
+ <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -138,8 +135,8 @@
<path refid="integration.target.client.classpath"/>
</path>
</target>
-
- <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700">
+
+ <target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x">
<path id="integration.target.javac.classpath">
<fileset dir="${jboss.home}/modules/javax/activation/api/main/">
@@ -154,6 +151,9 @@
<fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <include name="picketlink-core*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
@@ -176,9 +176,10 @@
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="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
- <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
- <pathelement location="${thirdparty.dir}/jnp-client.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
+ <!-- included from thirdparty local dir as it's not installed on AS - START -->
+ <pathelement location="${thirdparty.dir}/jboss-as-webservices-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/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
@@ -222,15 +223,24 @@
<fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/javax/transaction/api/main/">
+ <include name="jboss-transaction-api_1.1_spec-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/jboss/threads/main/">
<include name="jboss-threads-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/picketbox/main/">
<include name="picketbox-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <include name="picketlink-core*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/">
+ <include name="jboss-ejb-client-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/apache/xerces/main/">
<include name="xercesImpl-*.jar"/>
</fileset>
@@ -246,9 +256,21 @@
<fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/">
<include name="jboss-remoting-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/">
+ <include name="jboss-marshalling-river-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/remoting3/remoting-jmx/main/">
+ <include name="remoting-jmx-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
+ <include name="netty-*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
+ <include name="jbossxb-*.jar"/>
+ </fileset>
<fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
<include name="serializer-*.jar"/>
<include name="xalan-*.jar"/>
@@ -259,12 +281,14 @@
<fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
<include name="xnio-nio-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/">
+ <include name="jboss-remote-naming-*.jar"/>
+ </fileset>
<pathelement location="${tools.jar}"/>
</path>
</target>
-
-
- <target name="tests-classpath-jboss710" depends="tests-prepare" if="jbossws.integration.jboss710">
+
+ <target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
<path id="integration.target.javac.classpath">
<fileset dir="${jboss.home}/modules/javax/activation/api/main/">
@@ -304,9 +328,10 @@
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="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
- <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
- <pathelement location="${thirdparty.dir}/jnp-client.jar"/> <!-- included from thirdparty local dir as it's not installed on AS -->
+ <!-- included from thirdparty local dir as it's not installed on AS - START -->
+ <pathelement location="${thirdparty.dir}/jboss-as-webservices-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/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
@@ -392,14 +417,12 @@
<fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
- <!-- START ## jaxrpc tests ## -->
<fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
<include name="netty-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
<include name="jbossxb-*.jar"/>
</fileset>
- <!-- END ## jaxrpc tests ## -->
<fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
<include name="serializer-*.jar"/>
<include name="xalan-*.jar"/>
More information about the jbossws-commits
mailing list