[jboss-svn-commits] JBL Code SVN: r35899 - in labs/jbossesb/branches/JBESB_4_9_CP/product: lib/ext and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 8 03:18:15 EST 2010
Author: kevin.conner at jboss.com
Date: 2010-11-08 03:18:14 -0500 (Mon, 08 Nov 2010)
New Revision: 35899
Removed:
labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/juddi-client-3.0.4-SNAPSHOT.jar
labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/juddi-core-3.0.4-SNAPSHOT.jar
labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/uddi-ws-3.0.4-SNAPSHOT.jar
Modified:
labs/jbossesb/branches/JBESB_4_9_CP/product/.classpath
labs/jbossesb/branches/JBESB_4_9_CP/product/build-distr.xml
labs/jbossesb/branches/JBESB_4_9_CP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/build.xml
labs/jbossesb/branches/JBESB_4_9_CP/product/services/base-project-build.xml
Log:
Update juddi to 3.0.4: JBESB-3531
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/.classpath
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/.classpath 2010-11-08 06:52:35 UTC (rev 35898)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/.classpath 2010-11-08 08:18:14 UTC (rev 35899)
@@ -87,6 +87,8 @@
<classpathentry kind="lib" path="build/lib/jcr-1.0.jar"/>
<classpathentry kind="lib" path="build/lib/jgroups-2.4.1.jar"/>
<classpathentry kind="lib" path="build/lib/jsch-0.1.38.jar"/>
+ <classpathentry kind="lib" path="build/lib/juddi-client-3.0.4.jar"/>
+ <classpathentry kind="lib" path="build/lib/juddi-core-3.0.4.jar"/>
<classpathentry kind="lib" path="build/lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="build/lib/mail-1.4.jar"/>
<classpathentry kind="lib" path="build/lib/milyn-commons-1.2.5.jar"/>
@@ -127,6 +129,7 @@
<classpathentry kind="lib" path="build/lib/sxc-core-0.7.3.jar"/>
<classpathentry kind="lib" path="build/lib/sxc-runtime-0.7.3.jar"/>
<classpathentry kind="lib" path="build/lib/sxc-xpath-0.7.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/uddi-ws-3.0.4.jar"/>
<classpathentry kind="lib" path="build/lib/wstx-asl-3.2.0.jar"/>
<classpathentry kind="lib" path="build/lib/xbean-2.2.0.jar"/>
<classpathentry kind="lib" path="build/lib/xercesImpl-2.8.0.jar"/>
@@ -151,11 +154,8 @@
<classpathentry kind="lib" path="lib/ext/jbossws-cxf-server.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossws-spi.jar"/>
<classpathentry kind="lib" path="lib/ext/jms/activemq/backport-util-concurrent-2.1.jar"/>
- <classpathentry kind="lib" path="lib/ext/juddi-client-3.0.4-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="lib/ext/juddi-core-3.0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ext/servlet-api.jar"/>
<classpathentry kind="lib" path="lib/ext/standalone/c3p0-0.9.1-pre9.jar"/>
- <classpathentry kind="lib" path="lib/ext/uddi-ws-3.0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ext/wsdl4j-1.6.2.jar"/>
<classpathentry kind="lib" path="lib/ext/wstx-asl-3.2.8.jar"/>
<classpathentry kind="lib" path="services/jbossesb/lib/ext/jackrabbit-api-1.2.1.jar"/>
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/build-distr.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/build-distr.xml 2010-11-08 06:52:35 UTC (rev 35898)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/build-distr.xml 2010-11-08 08:18:14 UTC (rev 35899)
@@ -94,7 +94,7 @@
<fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
<!-- jUDDI Registry, we're one -->
<fileset dir="${lib.dir}" includes="scout-*.jar"/>
- <fileset dir="${lib.ext.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar"/>
+ <fileset dir="${lib.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar"/>
<fileset dir="${lib.dir}" includes="commons-configuration-*.jar,commons-codec-*.jar"/>
<!-- camel -->
<fileset dir="${lib.dir}" includes="camel-core-*.jar"/>
@@ -135,7 +135,7 @@
<include name="esb.juddi.xml"/>
<include name="juddi-sql/**"/>
</fileset>
- <fileset dir="${lib.ext.dir}" includes="juddi-core-*.jar"/>
+ <fileset dir="${lib.dir}" includes="juddi-core-*.jar"/>
<fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
</copy>
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/ivy.xml 2010-11-08 06:52:35 UTC (rev 35898)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/ivy.xml 2010-11-08 08:18:14 UTC (rev 35899)
@@ -43,11 +43,9 @@
<dependency org="jboss" name="jboss" rev="4.2.3.GA"/>
<dependency org="org.jboss.client" name="jbossall-client" rev="4.2.3.GA"/>
<dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
- <!-- Relying on a snaphot
- <dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.3"/>
- <dependency org="org.apache.juddi" name="juddi-client" rev="3.0.3"/>
- <dependency org="org.apache.juddi" name="juddi-core" rev="3.0.3"/>
- -->
+ <dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.4"/>
+ <dependency org="org.apache.juddi" name="juddi-client" rev="3.0.4"/>
+ <dependency org="org.apache.juddi" name="juddi-core" rev="3.0.4"/>
<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
<dependency org="log4j" name="log4j" rev="1.2.14"/>
Deleted: labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/juddi-client-3.0.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/juddi-core-3.0.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_9_CP/product/lib/ext/uddi-ws-3.0.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/build.xml 2010-11-08 06:52:35 UTC (rev 35898)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/build.xml 2010-11-08 08:18:14 UTC (rev 35899)
@@ -7,7 +7,7 @@
<property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
<property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <property name="uddi.webservices.jar" value="uddi-ws-3.0.4-SNAPSHOT.jar"/>
+ <property name="uddi.webservices.jar" value="uddi-ws-3.0.4.jar"/>
<property name="juddi.v3.war" value="juddiv3-3.0.2.war"/>
<property name="org.jboss.esb.registry.war.dir" location="war"/>
@@ -267,7 +267,7 @@
<zip destfile="${juddiv3.war.file}">
<zipfileset dir="${org.jboss.esb.registry.war.resources.dir}"/>
<zipfileset dir="${org.jboss.esb.registry.war.classes.dir}" prefix="WEB-INF/classes"/>
- <zipfileset src="${org.jboss.esb.ext.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
+ <zipfileset src="${org.jboss.esb.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
excludes="uddi_v3replication.xsd" prefix="WEB-INF/wsdl"/>
<zipfileset src="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}" includes="WEB-INF/classes/**/NotifyServlet.class"/>
</zip>
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/services/base-project-build.xml 2010-11-08 06:52:35 UTC (rev 35898)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/services/base-project-build.xml 2010-11-08 08:18:14 UTC (rev 35899)
@@ -74,8 +74,8 @@
<fileset dir="${esb.main.lib}" includes="jboss-ejb-api*.jar"/>
<fileset dir="${esb.main.lib}" includes="jbossall-client*.jar"/>
<fileset dir="${esb.main.lib}" includes="jcr*.jar"/>
- <fileset dir="${esb.product.lib.ext}" includes="juddi-client*.jar"/>
- <fileset dir="${esb.product.lib.ext}" includes="juddi-core*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="juddi-client*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="juddi-core*.jar"/>
<fileset dir="${esb.main.lib}" includes="log4j*.jar"/>
<fileset dir="${esb.main.lib}" includes="mail*.jar"/>
<fileset dir="${esb.main.lib}" includes="milyn-commons*.jar"/>
@@ -86,7 +86,7 @@
<fileset dir="${esb.main.lib}" includes="quartz*.jar"/>
<fileset dir="${esb.main.lib}" includes="scout*.jar"/>
<fileset dir="${esb.main.lib}" includes="stax-api*.jar"/>
- <fileset dir="${esb.product.lib.ext}" includes="uddi-ws*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="uddi-ws*.jar"/>
<fileset dir="${esb.main.lib}" includes="xbean*.jar"/>
<fileset dir="${esb.main.lib}" includes="xstream*.jar"/>
<pathelement location="${esb.root.dir}/etc/test/registry"/>
More information about the jboss-svn-commits
mailing list