Author: richard.opalka(a)jboss.com Date: 2011-06-07 10:15:37 -0400 (Tue, 07 Jun 2011) New Revision: 14482 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml Log: fixing tests - defining deployment dependencies Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-07 11:21:35 UTC (rev 14481) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-07 14:15:37 UTC (rev 14482) @@ -553,6 +553,9 @@ <include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" /> <include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml" /> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -562,12 +565,18 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2/META-INF"> <include name="ejb-jar.xml" /> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.class" /> <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.class" /> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -580,6 +589,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4/META-INF"> <include name="ejb-jar.xml" /> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar"> <fileset dir="${tests.output.dir}/test-libs"> @@ -824,6 +836,9 @@ <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -836,6 +851,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF"> <include name="ejb-jar.xml" /> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF/application.xml" earfile="${tests.output.dir}/test-libs/jaxws-jbws2634.ear"> <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634.jar" /> Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-06-07 11:21:35 UTC (rev 14481) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-06-07 14:15:37 UTC (rev 14482) @@ -44,6 +44,9 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF"> <include name="jboss-web.xml"/> </webinf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> </war> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-context.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -52,6 +55,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF"> <include name="jboss.xml"/> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> </jar> <!-- jaxws-samples-eardeployment --> @@ -64,6 +70,9 @@ <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.common"/> + </manifest> </war> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -72,6 +81,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear"> <fileset dir="${tests.output.dir}/test-libs"> @@ -233,6 +245,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/advanced/retail/META-INF"> <include name="wsdl/*"/> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <!-- jaxws-samples-securityDomain --> @@ -475,6 +490,9 @@ <exclude name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/> <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/> </fileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <jar destfile="${tests.output.dir}/test-libs/management-recording.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -483,6 +501,9 @@ <exclude name="org/jboss/test/ws/management/recording/EndpointImpl.class"/> <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/> </fileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.logging"/> + </manifest> </jar> <!-- saaj-jbws3084 -->