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

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

Author: tcunning
Date: 2011-06-30 15:34:30 -0400 (Thu, 30 Jun 2011)
New Revision: 37188

Removed:
   labs/jbossesb/trunk/product/lib/ext/juddi-client-3.1.0-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/juddi-core-3.1.0-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.1.0-SNAPSHOT.jar
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/lib/ext/scout-1.2.3-SNAPSHOT.jar
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
JBESB-3605
Upgrade to jUDDI 3.1.0. release.


Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2011-06-30 18:01:41 UTC (rev 37187)
+++ labs/jbossesb/trunk/product/build-distr.xml	2011-06-30 19:34:30 UTC (rev 37188)
@@ -94,7 +94,7 @@
             <fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
             <!-- jUDDI Registry, we're one -->
 	    <fileset dir="${lib.ext.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/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2011-06-30 18:01:41 UTC (rev 37187)
+++ labs/jbossesb/trunk/product/ivy.xml	2011-06-30 19:34:30 UTC (rev 37188)
@@ -45,11 +45,10 @@
         <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"/>
-<!--
-	<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="org.apache.juddi" name="uddi-ws" rev="3.1.0"/>
+	<dependency org="org.apache.juddi" name="juddi-client" rev="3.1.0"/>
+	<dependency org="org.apache.juddi" name="juddi-core" rev="3.1.0"/>
 	
 	<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.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)

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

Modified: labs/jbossesb/trunk/product/lib/ext/scout-1.2.3-SNAPSHOT.jar
===================================================================
(Binary files differ)

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

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-30 18:01:41 UTC (rev 37187)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-30 19:34:30 UTC (rev 37188)
@@ -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.1.0-SNAPSHOT.jar"/>
+    <property name="uddi.webservices.jar" value="uddi-ws-3.1.0.jar"/>
     <property name="juddi.v3.war" value="juddiv3-310-SNAPSHOT.war"/>
     <property name="juddi.v3.wsdl.location" value="org/jboss/internal/soa/esb/registry/client/wsdl"/>
     <property name="juddi.v3.wsdl.dir" location="juddiv3.wsdl"/>
@@ -192,7 +192,7 @@
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml"/>
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security-template.xml"/>
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="xmldsig-core-schema.xsd"/>
-            <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="${juddi.v3.wsdl.location}"/>
             <zipfileset dir="${juddi.v3.wsdl.dir}" prefix="${juddi.v3.wsdl.location}"/>
        	</jar>