[jbossws-commits] JBossWS SVN: r3142 - in trunk: integration/jbws/src/main/etc and 2 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2007-05-18 10:15:13 -0400 (Fri, 18 May 2007)
New Revision: 3142
Modified:
trunk/integration/jbws/build.xml
trunk/integration/jbws/src/main/etc/component-info-jboss42.xml
trunk/integration/jbws/src/main/etc/component-info-jboss50.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/etc/component-info.xml
trunk/jbossws-core/version.properties
Log:
Fix component-info.xml
Modified: trunk/integration/jbws/build.xml
===================================================================
--- trunk/integration/jbws/build.xml 2007-05-18 14:01:34 UTC (rev 3141)
+++ trunk/integration/jbws/build.xml 2007-05-18 14:15:13 UTC (rev 3142)
@@ -67,7 +67,7 @@
<mkdir dir="${jbws.output.etc.dir}"/>
<copy todir="${jbws.output.etc.dir}" filtering="yes">
<fileset dir="${jbws.etc.dir}">
- <include name="component-info.xml"/>
+ <include name="component-info-*.xml"/>
</fileset>
<fileset dir="${build.dir}/etc">
<include name="default.mf"/>
Modified: trunk/integration/jbws/src/main/etc/component-info-jboss42.xml
===================================================================
--- trunk/integration/jbws/src/main/etc/component-info-jboss42.xml 2007-05-18 14:01:34 UTC
(rev 3141)
+++ trunk/integration/jbws/src/main/etc/component-info-jboss42.xml 2007-05-18 14:15:13 UTC
(rev 3142)
@@ -16,10 +16,10 @@
<compatible version="@jboss-microcontainer@"/>
</import>
<import componentref="jboss/jbossws">
- <compatible version="@jboss-jbossws@"/>
+ <compatible version="@repository.id(a)"/>
</import>
<import componentref="jboss/jbossws-spi">
- <compatible version="@jboss-jbossws-spi@"/>
+ <compatible version="@repository.id(a)"/>
</import>
<export>
Modified: trunk/integration/jbws/src/main/etc/component-info-jboss50.xml
===================================================================
--- trunk/integration/jbws/src/main/etc/component-info-jboss50.xml 2007-05-18 14:01:34 UTC
(rev 3141)
+++ trunk/integration/jbws/src/main/etc/component-info-jboss50.xml 2007-05-18 14:15:13 UTC
(rev 3142)
@@ -17,10 +17,10 @@
<compatible version="@jboss-microcontainer@"/>
</import>
<import componentref="jboss/jbossws">
- <compatible version="@jboss-jbossws@"/>
+ <compatible version="@repository.id(a)"/>
</import>
<import componentref="jboss/jbossws-spi">
- <compatible version="@jboss-jbossws-spi@"/>
+ <compatible version="@repository.id(a)"/>
</import>
<export>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-18 14:01:34 UTC (rev 3141)
+++ trunk/jbossws-core/build.xml 2007-05-18 14:15:13 UTC (rev 3142)
@@ -100,6 +100,7 @@
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="jbossws-${version.id}"/>
<filtersfile file="${build.dir}/version.properties"/>
+ <filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
</target>
Modified: trunk/jbossws-core/src/main/etc/component-info.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/component-info.xml 2007-05-18 14:01:34 UTC (rev 3141)
+++ trunk/jbossws-core/src/main/etc/component-info.xml 2007-05-18 14:15:13 UTC (rev 3142)
@@ -29,7 +29,7 @@
<compatible version="@jbpm-bpel@"/>
</import>
<import componentref="jboss/jbossws-spi">
- <compatible version="@jbossws-spi@"/>
+ <compatible version="@repository.id(a)"/>
</import>
<import componentref="jboss/jbossws-wsconsume-impl">
<compatible version="@jbossws-wsconsume-impl@"/>
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-18 14:01:34 UTC (rev 3141)
+++ trunk/jbossws-core/version.properties 2007-05-18 14:15:13 UTC (rev 3142)
@@ -7,6 +7,7 @@
javassist=3.5.0.CR1
jbossws-wsconsume-impl=2.0.0
jbpm-bpel=1.1.0.Beta5
+sun-jaxb=2.1.3
stax-api=1.0
# Thirdparty library versions
@@ -33,7 +34,6 @@
sun-hudson=1.93
sun-jaf=1.1
sun-javamail=1.4
-sun-jaxb=2.1.3
woodstox=3.1.1
wscommons-policy=1.0
xmlunit=1.0