[jboss-svn-commits] JBL Code SVN: r33357 - in labs/jbossesb/trunk/product: lib/ext and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2010-06-04 16:07:34 -0400 (Fri, 04 Jun 2010)
New Revision: 33357

Added:
   labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.2.SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.2.war
Removed:
   labs/jbossesb/trunk/product/lib/ext/juddi-client-3.0.1.jar
   labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.1.jar
   labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.1.war
   labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.0.1.jar
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
JBESB-3336
Upgrade juddi version from 3.0.1 to 3.0.2.   Needed to check in juddi-core snapshot temporarily in order to 
resolve JUDDI-401.


Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2010-06-04 19:06:10 UTC (rev 33356)
+++ labs/jbossesb/trunk/product/build-distr.xml	2010-06-04 20:07:34 UTC (rev 33357)
@@ -93,8 +93,8 @@
             <fileset dir="${lib.dir}" includes="xbean*.jar"/>
             <fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
             <!-- jUDDI Registry, we're one -->
-            <!-- temporary until juddi 3.0.1 and scout 1.2.1 releases pushed out through maven -->
-	    <fileset dir="${lib.ext.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar scout-*.jar"/>
+	    <fileset dir="${lib.ext.dir}" includes="scout-*.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"/>
@@ -132,7 +132,6 @@
                 <include name="esb.juddi.xml"/>
                 <include name="juddi-sql/**"/>
             </fileset>
-            <!-- temporary until 3.0.1 release pushed out through maven -->
 	    <fileset dir="${lib.ext.dir}" includes="juddi-core-*.jar"/>
             <fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
 	</copy>		

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2010-06-04 19:06:10 UTC (rev 33356)
+++ labs/jbossesb/trunk/product/ivy.xml	2010-06-04 20:07:34 UTC (rev 33357)
@@ -43,10 +43,10 @@
         <dependency org="jboss" name="jboss" rev="4.2.2.GA"/>
         <dependency org="jboss" name="jbossall-client" rev="4.2.2.GA"/>
         <dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
-        <!-- temporary until 3.0.1 is pushed into maven.  Also need to add juddiv3.war
-	<dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.1"/>
-	<dependency org="org.apache.juddi" name="juddi-client" rev="3.0.1"/>
-	<dependency org="org.apache.juddi" name="juddi-core" rev="3.0.1"/>
+	<dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.2"/>
+	<dependency org="org.apache.juddi" name="juddi-client" rev="3.0.2"/>
+	<!--
+	<dependency org="org.apache.juddi" name="juddi-core" rev="3.0.2"/>
 	-->
 	<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
         <dependency org="log4j" name="log4j" rev="1.2.14"/>

Deleted: labs/jbossesb/trunk/product/lib/ext/juddi-client-3.0.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.1.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.2.SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.2.SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.1.war
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.2.war
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.2.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.0.1.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2010-06-04 19:06:10 UTC (rev 33356)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2010-06-04 20:07:34 UTC (rev 33357)
@@ -7,8 +7,8 @@
 	<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.1.jar"/>
-    <property name="juddi.v3.war" value="juddiv3-3.0.1.war"/>
+    <property name="uddi.webservices.jar" value="uddi-ws-3.0.2.jar"/>
+    <property name="juddi.v3.war" value="juddiv3-3.0.2.war"/>
 
     <property name="org.jboss.esb.registry.war.dir" location="war"/>
     <property name="org.jboss.esb.registry.war.src.dir" location="${org.jboss.esb.registry.war.dir}/java"/>
@@ -264,7 +264,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*"
+            <zipfileset src="${org.jboss.esb.lib.dir}/${uddi.webservices.jar}" includes="uddi*"
                 prefix="WEB-INF/wsdl"/>
             <zipfileset src="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}" includes="WEB-INF/classes/**/NotifyServlet.class"/>
         </zip>