[jbossws-commits] JBossWS SVN: r1783 - in trunk: . build build/ant-import build/etc integration-jboss40 integration-jboss40/src integration-jboss40/src/main integration-jboss42 integration-jboss50 jbossws-tests jbossws-tests/src/main/java/org/jboss/test/ws jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093 jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1107 jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/sam

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 07:46:32 -0500 (Thu, 04 Jan 2007) New Revision: 1783 Added: trunk/integration-jboss40/ trunk/integration-jboss40/.classpath trunk/integration-jboss40/.project trunk/integration-jboss40/build.xml trunk/integration-jboss40/src/ trunk/integration-jboss40/src/main/ trunk/integration-jboss40/src/main/java/ trunk/integration-jboss40/src/main/resources/ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt Removed: trunk/jbossws-tests/src/main/resources/tests-no-excludes.txt Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/etc/jbossws-component-info.xml trunk/integration-jboss42/build.xml trunk/integration-jboss50/build.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wseventing/SysmonTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java Log: Add jboss-4.0 integration Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/build/ant-import/build-setup.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -23,6 +23,7 @@ <property name="build.dir" value="${basedir}/../build"/> <property name="docs.dir" value="${basedir}/../docs"/> + <property name="integration.jboss40.dir" value="${basedir}/../integration-jboss40"/> <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/> @@ -48,6 +49,13 @@ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> + <property name="jboss40.lib" value="${jboss40.home}/lib"/> + <property name="jboss40.client" value="${jboss40.home}/client"/> + <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> + <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> + <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/> + <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/build/ant.properties.example 2007-01-04 12:46:32 UTC (rev 1783) @@ -6,9 +6,10 @@ # Required JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -# The JBoss server under test. This can be [jboss42|jboss50] -jboss.integration.target=jboss50 +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] +jbossws.integration.target=jboss50 # The JBoss server instance jboss.server.instance=default @@ -18,9 +19,6 @@ tomcat.manager.username=manager tomcat.manager.password=manager -# The target server the test endpoints are deployed to. This can be [jboss|tomcat] -jbossws.target.server=jboss - # JBoss Repository #jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository jboss.repository=http://repository.jboss.com Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/build/build.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -16,6 +16,7 @@ <import file="${basedir}/ant-import/build-thirdparty.xml"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> @@ -31,7 +32,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="init,core-jars,jboss42-jars,jboss50-jars,tomcat-jars" description="Builds all jar files."> + <target name="jars" depends="init,core-jars,jboss40-jars,jboss42-jars,jboss50-jars,tomcat-jars" description="Builds all jar files."> </target> <target name="build-docs" description="Build the documentation"> @@ -41,6 +42,7 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}/output"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${integration.jboss40.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -8,6 +8,7 @@ <artifact id="jboss-jaxrpc.jar"/> <artifact id="jboss-jaxws.jar"/> <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws40.sar"/> <artifact id="jbossws42.sar"/> <artifact id="jbossws50.sar"/> <artifact id="jbossws50-deployer.jar"/> Property changes on: trunk/integration-jboss40 ___________________________________________________________________ Name: svn:ignore + output output-eclipse Added: trunk/integration-jboss40/.classpath =================================================================== --- trunk/integration-jboss40/.classpath 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/integration-jboss40/.classpath 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Added: trunk/integration-jboss40/.project =================================================================== --- trunk/integration-jboss40/.project 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/integration-jboss40/.project 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>integration-jboss40</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/integration-jboss40/build.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1,184 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40"> + + <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/../jbossws-core/build.xml"/> + + <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src/main"/> + <property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/> + <property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/> + <property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/> + <property name="jboss40.output.classes.dir" value="${jboss40.output.dir}/classes"/> + <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> + <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> + + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> + <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> + <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> + <property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/> + <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> + <property name="jboss42.output.classes14.dir" value="${jboss42.output.dir}/classes14"/> + <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> + + <target name="jboss40-init" depends="prepare, thirdparty"> + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + + <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-etc" description="Compile all source files."/> + + <!-- Compile integration java sources --> + <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> + <mkdir dir="${jboss40.output.classes.dir}"/> + <javac srcdir="${jboss40.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/ws/integration/jboss40/**"/> + <classpath refid="jboss40.integration.classpath"/> + <classpath path="${core.output.classes14.dir}"/> + <classpath path="${core.output.classes.dir}"/> + </javac> + </target> + + <!-- Compile etc files (manifests and such) --> + <target name="jboss40-compile-etc" depends="jboss40-init"> + </target> + + <!-- ================================================================== --> + <!-- Archives --> + <!-- ================================================================== --> + + <!-- + | Build all jar files. + --> + <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> + </target> + + <!-- + | Build all jar files. + --> + <target name="jboss40-module-jars" depends="core-jars"> + + <!-- Build jbossws-jboss40-integration.jar --> + <mkdir dir="${jboss40.output.lib.dir}"/> + <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${output.etc.dir}/default.mf"> + <fileset dir="${jboss42.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss42/**"/> + </fileset> + <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> + </jar> + + <!-- Build jbossws-context.war --> + <war warfile="${jboss40.output.lib.dir}/jbossws-context.war" webxml="${jboss42.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${core.resources.dir}/jbossws.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${jboss42.resources.dir}/jbossws.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + + <!-- Build jbossws40.sar --> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${output.etc.dir}/default.mf"> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> + <include name="jboss-jaxws.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy-1.0.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-api-1.0.jar"/> + <include name="wstx-lgpl-2.9.3.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${jboss42.resources.dir}"> + <include name="jbossws.beans/META-INF/jboss-beans.xml"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> + <include name="standard-jaxrpc-client-config.xml"/> + <include name="standard-jaxrpc-endpoint-config.xml"/> + <include name="standard-jaxws-client-config.xml"/> + <include name="standard-jaxws-endpoint-config.xml"/> + </metainf> + <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + + </target> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to the jboss40 --> + <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> + <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss40.home}/client" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> + </target> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jboss40.output.dir}"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jboss40-jars"/> + + <target name="all" description="Create a distribution zip file" depends="main"> + </target> + +</project> \ No newline at end of file Property changes on: trunk/integration-jboss40/build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/integration-jboss42/build.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -77,7 +77,6 @@ <mkdir dir="${jboss42.output.lib.dir}"/> <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${output.etc.dir}/default.mf"> <fileset dir="${jboss42.output.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/integration-jboss50/build.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -77,7 +77,6 @@ <mkdir dir="${jboss50.output.lib.dir}"/> <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${output.etc.dir}/default.mf"> <fileset dir="${jboss50.output.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> <metainf dir="${jboss50.resources.dir}/jbossws-jboss50-integration.jar/META-INF"/> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/build.xml 2007-01-04 12:46:32 UTC (rev 1783) @@ -43,11 +43,14 @@ <!-- Define jboss.home --> <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jboss.integration.target}" arg2="jboss50"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jboss.integration.target}" arg2="jboss42"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + </condition> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> @@ -110,12 +113,7 @@ <target name="init" depends="prepare,thirdparty"> <!-- Define excluded tests --> - <condition property="tests.excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"> - <equals arg1="${jbossws.target.server}" arg2="jboss"/> - </condition> - <condition property="tests.excludesfile" value="${tests.resources.dir}/tests-tomcat-excludes.txt"> - <equals arg1="${jbossws.target.server}" arg2="tomcat"/> - </condition> + <property name="tests.excludesfile" value="${tests.resources.dir}/tests-${jbossws.integration.target}-excludes.txt"/> <!-- The jbossws client classpath --> <path id="jbossws.client.classpath"> @@ -148,8 +146,8 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> + <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> </path> @@ -159,8 +157,8 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> + <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> @@ -373,7 +371,7 @@ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> - <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> @@ -412,7 +410,7 @@ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> - <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="client.scenario" value="${client.scenario}"/> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -55,39 +55,34 @@ /** Get the MBeanServerConnection from JNDI */ public MBeanServerConnection getServer() throws NamingException { - return delegate.getServer(); + return JBossWSTestHelper.getServer(); } - /** True, if -Djbossws.target.server=jboss */ - public boolean isTargetServerJBoss() + /** True, if -Djbossws.integration.target=jboss?? */ + public boolean isTargetJBoss() { - return delegate.isTargetServerJBoss(); + return JBossWSTestHelper.isTargetJBoss(); } - /** True, if -Djbossws.target.server=tomcat */ - public boolean isTargetServerTomcat() + /** True, if -Djbossws.integration.target=tomcat */ + public boolean isTomcat() { - return delegate.isTargetServerTomcat(); + return JBossWSTestHelper.isTargetTomcat(); } - public String getJBossVersion() - { - return delegate.getJBossVersion(); - } - public boolean isJBoss50() { - return delegate.isJBoss50(); + return JBossWSTestHelper.isTargetJBoss50(); } public boolean isJBoss42() { - return delegate.isJBoss42(); + return JBossWSTestHelper.isTargetJBoss42(); } public boolean isJBoss40() { - return delegate.isJBoss40(); + return JBossWSTestHelper.isTargetJBoss40(); } /** Deploy the given archive Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -26,12 +26,9 @@ import java.net.URL; import javax.management.MBeanServerConnection; -import javax.management.ObjectName; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jboss.ws.core.utils.ObjectNameFactory; - /** * A JBossWS test helper that deals with test deployment/undeployment, etc. * @@ -58,56 +55,40 @@ getDeployer().undeploy(url); } - /** True, if -Djbossws.target.server=jboss */ - public static boolean isTargetServerJBoss() + /** True, if -Djbossws.integration.target=tomcat */ + public static boolean isTargetTomcat() { - String targetServer = getTargetServer(); - return "jboss".equals(targetServer); + String target = getIntegrationTarget(); + return "tomcat".equals(target); } - /** True, if -Djbossws.target.server=tomcat */ - public static boolean isTargetServerTomcat() + /** True, if -Djbossws.integration.target=jboss?? */ + public static boolean isTargetJBoss() { - String targetServer = getTargetServer(); - return "tomcat".equals(targetServer); + String target = getIntegrationTarget(); + return target != null && target.startsWith("jboss"); } - public static String getJBossVersion() + /** True, if -Djbossws.integration.target=jboss50 */ + public static boolean isTargetJBoss50() { - String jbossVersion = null; - if (isTargetServerJBoss()) - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); - } - catch (Exception ex) - { - // ignore - ex.printStackTrace(); - } - } - return jbossVersion; + String target = getIntegrationTarget(); + return "jboss50".equals(target); } - public static boolean isJBoss50() + /** True, if -Djbossws.integration.target=jboss42 */ + public static boolean isTargetJBoss42() { - String jbossVersion = getJBossVersion(); - return jbossVersion != null && jbossVersion.startsWith("5.0"); + String target = getIntegrationTarget(); + return "jboss42".equals(target); } - public static boolean isJBoss42() + /** True, if -Djbossws.integration.target=jboss40 */ + public static boolean isTargetJBoss40() { - String jbossVersion = getJBossVersion(); - return jbossVersion != null && jbossVersion.startsWith("4.2"); + String target = getIntegrationTarget(); + return "jboss40".equals(target); } - - public static boolean isJBoss40() - { - String jbossVersion = getJBossVersion(); - return jbossVersion != null && jbossVersion.startsWith("4.0"); - } public static MBeanServerConnection getServer() { @@ -128,11 +109,11 @@ private JBossWSTestDeployer getDeployer() { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { return new JBossTestDeployer(getServer()); } - else if (isTargetServerTomcat()) + else if (isTargetTomcat()) { String username = System.getProperty("tomcat.manager.username"); String password = System.getProperty("tomcat.manager.password"); @@ -140,13 +121,13 @@ } else { - throw new IllegalStateException("Unsupported target server: " + getTargetServer()); + throw new IllegalStateException("Unsupported target server: " + getIntegrationTarget()); } } - private static String getTargetServer() + private static String getIntegrationTarget() { - return System.getProperty("jbossws.target.server"); + return System.getProperty("jbossws.integration.target"); } /** Try to discover the URL for the deployment archive */ Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -64,7 +64,7 @@ { String archive = archives[i]; boolean isJ2EEClient = archive.endsWith("-client.jar"); - if (delegate.isTargetServerJBoss() || isJ2EEClient == false) + if (delegate.isTargetJBoss() || isJ2EEClient == false) { try { @@ -104,7 +104,7 @@ { String archive = archives[archives.length - i - 1]; boolean isJ2EEClient = archive.endsWith("-client.jar"); - if (delegate.isTargetServerJBoss() || isJ2EEClient == false) + if (delegate.isTargetJBoss() || isJ2EEClient == false) { delegate.undeploy(archive); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -59,7 +59,7 @@ super.setUp(); if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ super.setUp(); if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -67,7 +67,7 @@ private ExceptionServiceInterface getPort() throws Exception { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); ExceptionService service = (ExceptionService)iniCtx.lookup("java:comp/env/service/ExceptionService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -62,7 +62,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -79,7 +79,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -57,7 +57,7 @@ if (port == null) { System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); - if (isTargetServerJBoss() && false) + if (isTargetJBoss() && false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -132,7 +132,7 @@ private MessageTestService getPort() throws Exception { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -64,7 +64,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -65,7 +65,7 @@ if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wseventing/SysmonTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wseventing/SysmonTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wseventing/SysmonTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -87,7 +87,7 @@ if (subscriptionPort == null || managementPort == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/SysmonService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -72,7 +72,7 @@ private Hello getPort() throws Exception { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -72,7 +72,7 @@ private Hello getPort() throws Exception { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -61,7 +61,7 @@ { if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -47,7 +47,7 @@ { public static Test suite() { - String earName = (JBossWSTestHelper.isJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); + String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/JSR181WebServiceJSETestCase.java 2007-01-04 12:46:32 UTC (rev 1783) @@ -59,7 +59,7 @@ super.setUp(); if (port == null) { - if (isTargetServerJBoss()) + if (isTargetJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Added: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1 @@ +nothing-to-exclude/** \ No newline at end of file Property changes on: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1 @@ +nothing-to-exclude/** \ No newline at end of file Property changes on: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-04 12:46:32 UTC (rev 1783) @@ -0,0 +1 @@ +nothing-to-exclude/** \ No newline at end of file Property changes on: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-tests/src/main/resources/tests-no-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-no-excludes.txt 2007-01-04 11:16:06 UTC (rev 1782) +++ trunk/jbossws-tests/src/main/resources/tests-no-excludes.txt 2007-01-04 12:46:32 UTC (rev 1783) @@ -1 +0,0 @@ -nothing-to-exclude/** \ No newline at end of file