Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:44:00 -0400 (Fri, 28 Sep 2007) New Revision: 4642 Added: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt Modified: framework/trunk/src/test/ant-import/build-testsuite.xml stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml stack/native/branches/ropalka/trunk/ant.properties.example stack/native/branches/ropalka/trunk/build.xml Log: [JBWS-1796] reparing the JBoss AS 4.0 no EJB3 integration Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -20,6 +20,9 @@ <condition property="jboss.home" value="${jboss40.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40.no.ejb3"/> + </condition> <!-- ================================================================== --> <!-- Setup --> @@ -103,7 +106,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40"/> + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40,tests-classpath-jboss40-no-ejb3"/> <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> @@ -269,6 +272,52 @@ </path> </target> + <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss40.no.ejb3"> + <path id="tests.javac.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-common-client.jar"/> + <pathelement location="${jboss.client}/jboss-j2ee.jar"/> + <pathelement location="${jboss.client}/jboss-remoting.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/stax-api.jar"/> + <pathelement location="${jboss.client}/jbosssx-client.jar"/> + <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> + </path> + + <!-- + The 'tests.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 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. + --> + <path id="tests.client.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${jboss.client}/commons-logging.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jaxb-xjc.jar"/> + <pathelement location="${jboss.client}/jboss-saaj.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/stax-api.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <!-- FIXME jars should be available in the client dir --> + <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}"/> + </path> + </target> + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> Modified: stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -97,13 +97,7 @@ </target> <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> - <macro-setup-native40-no-ejb3/> - <echo> - *********************************** - * JBossWS EJB3 support disabled * - * All EJB3 tests will fail. * - *********************************** - </echo> + <macro-setup-native40-no-ejb3/> </target> <!-- Remove jbossws from jboss40 --> Modified: stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -282,6 +282,7 @@ </fileset> </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native40.sar&quot;/&gt; <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> Modified: stack/native/branches/ropalka/trunk/ant.properties.example =================================================================== --- stack/native/branches/ropalka/trunk/ant.properties.example 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant.properties.example 2007-09-28 07:44:00 UTC (rev 4642) @@ -6,9 +6,10 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA #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 [jboss50|jboss42|jboss40] +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3] jbossws.integration.target=jboss50 # The JBoss server instance Modified: stack/native/branches/ropalka/trunk/build.xml =================================================================== --- stack/native/branches/ropalka/trunk/build.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/build.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -310,6 +310,18 @@ </footer> </concat> + <!-- Concat jboss-beans.xml --> + <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${core.output.dir}/resources/jbossws-jboss40-config-no-ejb3.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + <!-- Build jbossws-native40.sar --> <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> @@ -334,6 +346,7 @@ </fileset> <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF"> <include name="jboss-service.xml"/> + <include name="jboss-service-no-ejb3.xml"/> </metainf> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> Added: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt (rev 0) +++ stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-09-28 07:44:00 UTC (rev 4642) @@ -0,0 +1,48 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3 compilation excludes +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/context/EndpointEJB* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/swaref/** +org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/serviceref/*EJB* +org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1446/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1556/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws771/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/handlerlifecycle/** + +# EJB3 runtime excludes +org/jboss/test/ws/interop/wsa/AddressingTestCase* +org/jboss/test/ws/interop/wsse/EncryptTestCase* +org/jboss/test/ws/interop/wsse/SignTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase* +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* +org/jboss/test/ws/jaxws/wseventing/EventingTestCase* +org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* +org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* +org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* +org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF