[jbossws-commits] JBossWS SVN: r1849 - in trunk: build/ant-import integration-jboss40 jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment

Author: thomas.diesler(a)jboss.com Date: 2007-01-06 10:22:26 -0500 (Sat, 06 Jan 2007) New Revision: 1849 Modified: trunk/build/ant-import/build-release.xml trunk/integration-jboss40/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java Log: Fix jboss40-retro Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-06 14:58:51 UTC (rev 1848) +++ trunk/build/ant-import/build-release.xml 2007-01-06 15:22:26 UTC (rev 1849) @@ -68,7 +68,7 @@ </filterset> </copy> - <!-- jbossws14 --> + <!-- jbossws14 - -> <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> <mkdir dir="${jbossws14.repository.dir}/lib"/> <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> @@ -82,11 +82,12 @@ <include name="jboss-jaxws14.jar"/> </fileset> </copy> - <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> + --> </target> Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-06 14:58:51 UTC (rev 1848) +++ trunk/integration-jboss40/build.xml 2007-01-06 15:22:26 UTC (rev 1849) @@ -87,10 +87,11 @@ <classpath> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${thirdparty.dir}/ant.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jbossretro.jar"/> <pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> <pathelement path="${jboss42.output.classes.dir}"/> <pathelement path="${core.dir}/output/classes"/> </classpath> 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-06 14:58:51 UTC (rev 1848) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-06 15:22:26 UTC (rev 1849) @@ -65,6 +65,9 @@ public void testVirtualFile() throws Exception { + if (isTargetJBoss50() == false) + return; + File earFile = new File("libs/jaxws-eardeployment.ear"); assertTrue(earFile.exists());