8:25 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-02-14 09:25:52 -0500 (Wed, 14 Feb 2007)
New Revision: 2360
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/integration-jboss40/build.xml
branches/jbossws-1.2.0/integration-jboss42/build.xml
branches/jbossws-1.2.0/integration-jboss50/build.xml
branches/jbossws-1.2.0/jbossws-core/.classpath
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
[JBWS-1517] Resolve dependency on juddi-service.sar
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 23:52:13 UTC
(rev 2359)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-14 14:25:52 UTC
(rev 2360)
@@ -45,13 +45,14 @@
<get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer"
dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar"
dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar"
dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar"
dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar"
dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar"
dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar"
dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar"
usetimestamp="true" verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true"
verbose="true"/>
- <!--get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-src.zip"
dest="${thirdparty.dir}/jboss-xml-binding-src.zip" usetimestamp="true"
verbose="true"/-->
+ <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar"
dest="${thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
<get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar"
dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true"
verbose="true"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-13 23:52:13 UTC (rev 2359)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-14 14:25:52 UTC (rev 2360)
@@ -17,7 +17,7 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.5.2jboss
javassist=3.4.GA
-jboss-jbossxb=snapshot
+jboss-jbossxb=1.0.0.CR9
jboss-microcontainer=1.0.2
jboss-remoting=2.0.0.GA
sun-jaxb=2.0.3
@@ -38,6 +38,7 @@
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
+jboss-jaxr=1.2.0.GA
jboss-jbossretro=1.0.4.GA
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-13 23:52:13 UTC (rev
2359)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-14 14:25:52 UTC (rev
2360)
@@ -338,13 +338,10 @@
<copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/client"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <!--
- [JBWS-1517] - Resolve dependency on juddi-service.sar
- -->
+ <!-- Deploy juddi-service.sar -->
+ <delete
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<mkdir
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <copy
todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
- <fileset
dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/>
- </copy>
+ <unzip
dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="${thirdparty.dir}/juddi-service.sar"/>
</target>
<!-- Deploy jbossws to jboss40 jdk1.4 -->
@@ -393,13 +390,10 @@
<copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/client"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <!--
- [JBWS-1517] - Resolve dependency on juddi-service.sar
- -->
+ <!-- Deploy juddi-service.sar -->
+ <delete
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<mkdir
dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <copy
todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
- <fileset
dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/>
- </copy>
+ <unzip
dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="${thirdparty.dir}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-13 23:52:13 UTC (rev
2359)
+++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-14 14:25:52 UTC (rev
2360)
@@ -166,13 +166,10 @@
<include name="jbossws-jboss42-integration.jar"/>
</fileset>
</copy>
- <!--
- [JBWS-1517] - Resolve dependency on juddi-service.sar
- -->
+ <!-- Deploy juddi-service.sar -->
+ <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <copy
todir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
- <fileset
dir="${jboss42.home}/server/all/deploy/juddi-service.sar"/>
- </copy>
+ <unzip
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="${thirdparty.dir}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-13 23:52:13 UTC (rev
2359)
+++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-14 14:25:52 UTC (rev
2360)
@@ -175,13 +175,10 @@
<include name="jbossws-jboss50-integration.jar"/>
</fileset>
</copy>
- <!--
- [JBWS-1517] - Resolve dependency on juddi-service.sar
- -->
+ <!-- Deploy juddi-service.sar -->
+ <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <copy
todir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
- <fileset
dir="${jboss50.home}/server/all/deploy/juddi-service.sar"/>
- </copy>
+ <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="${thirdparty.dir}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/jbossws-core/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-13 23:52:13 UTC (rev 2359)
+++ branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-14 14:25:52 UTC (rev 2360)
@@ -14,7 +14,7 @@
<classpathentry kind="lib"
path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib"
path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib"
path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib"
path="/build/thirdparty/jboss-xml-binding.jar"
sourcepath="/build/thirdparty/jboss-xml-binding-src.zip"/>
+ <classpathentry kind="lib"
path="/build/thirdparty/jboss-xml-binding.jar"
sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/>
<classpathentry kind="lib"
path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib"
path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib"
path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13
23:52:13 UTC (rev 2359)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-14
14:25:52 UTC (rev 2360)
@@ -197,7 +197,7 @@
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/>
+ <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement
location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 23:52:13 UTC (rev 2359)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-14 14:25:52 UTC (rev 2360)
@@ -204,7 +204,7 @@
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/>
+ <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement
location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>