Author: thomas.diesler(a)jboss.com Date: 2007-01-05 05:37:52 -0500 (Fri, 05 Jan 2007) New Revision: 1804 Modified: trunk/build/ant-import/build-setup.xml trunk/build/etc/jbossws-component-info.xml trunk/build/version.properties Log: Fix deploy-tomcat Add jboss-service.xml without ejb3 Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-05 10:37:47 UTC (rev 1803) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 10:37:52 UTC (rev 1804) @@ -76,9 +76,6 @@ <echo/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - <available property="jbossws.thirdparty.available" file="${output.lib.dir}/jbossws-thirdparty.jar"/> - <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <checksum file="${build.dir}/version.properties" fileext=".md5"/> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-05 10:37:47 UTC (rev 1803) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-05 10:37:52 UTC (rev 1804) @@ -11,7 +11,7 @@ <artifact id="jbossws40.sar"/> <artifact id="jbossws42.sar"/> <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.jar"/> + <artifact id="jbossws50-deployer.zip"/> <artifact id="jbossws-client.jar"/> <artifact id="jbossws-jboss42-integration.jar"/> <artifact id="jbossws-jboss50-integration.jar"/> @@ -20,15 +20,18 @@ <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> <import componentref="javassist"> <compatible version="@javassist@"/> </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> <import componentref="jboss/remoting"> <compatible version="1.4.5.GA"/> <compatible version="@jboss-remoting@"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-05 10:37:47 UTC (rev 1803) +++ trunk/build/version.properties 2007-01-05 10:37:52 UTC (rev 1804) @@ -17,11 +17,10 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.4.GA -jboss-common-core=2.0.2.CR1 -jboss-common-logging=2.0.1.GA jboss-jbossxb=snapshot jboss-microcontainer=snapshot jboss-remoting=2.0.0.GA +sun-jaxb=2.0.3 # thirdparty library versions apache-ant=1.6.5 @@ -30,6 +29,8 @@ apache-xerces=2.7.1 hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA +jboss-common-core=2.0.2.CR1 +jboss-common-logging=2.0.1.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 jboss-jbossretro=1.0.2.GA jbossas-core-libs=4.0.5.GA @@ -40,7 +41,6 @@ stax-api=1.0 sun-jaf=1.0.2 sun-javamail=1.3.1 -sun-jaxb=2.0.3 sun-servlet=2.4 woodstox=2.0.6 wscommons-policy=1.0