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

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

Author: tcunning
Date: 2010-07-23 12:23:46 -0400 (Fri, 23 Jul 2010)
New Revision: 34143

Removed:
   labs/jbossesb/trunk/product/lib/ext/juddi-client-3.0.3.jar
   labs/jbossesb/trunk/product/lib/ext/juddi-core-3.0.3.jar
   labs/jbossesb/trunk/product/lib/ext/scout-1.2.2.jar
   labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.0.3.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
Artifacts now available on repos, remove the lib/ext JARs and add the
dependencies in the ivy.xml file.



Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2010-07-23 15:22:27 UTC (rev 34142)
+++ labs/jbossesb/trunk/product/build-distr.xml	2010-07-23 16:23:46 UTC (rev 34143)
@@ -93,8 +93,8 @@
             <fileset dir="${lib.dir}" includes="xbean*.jar"/>
             <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="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,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	2010-07-23 15:22:27 UTC (rev 34142)
+++ labs/jbossesb/trunk/product/ivy.xml	2010-07-23 16:23:46 UTC (rev 34143)
@@ -31,9 +31,7 @@
         <dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
 
         <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
-        <!-- temporary until 1.2.1 is pushed into maven
-        <dependency org="org.apache.ws.scout" name="scout" rev="1.2.1"/>
-        -->
+        <dependency org="org.apache.ws.scout" name="scout" rev="1.2.2"/>
         <dependency org="org.apache.camel" name="camel-core" rev="2.3.0"/>
         <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0"/>
 
@@ -43,11 +41,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.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="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="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.3.jar
===================================================================
(Binary files differ)

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

Deleted: labs/jbossesb/trunk/product/lib/ext/scout-1.2.2.jar
===================================================================
(Binary files differ)

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

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2010-07-23 15:22:27 UTC (rev 34142)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2010-07-23 16:23:46 UTC (rev 34143)
@@ -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*"
+            <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>