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

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

Author: tcunning
Date: 2011-06-20 15:44:50 -0400 (Mon, 20 Jun 2011)
New Revision: 37099

Removed:
   labs/jbossesb/trunk/product/lib/ext/juddiv3-3.0.2.war
Modified:
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/rosetta/build.xml
Log:
JBESB-3618
Use the jUDDI 3.1.0 snapshot WAR rather than the 3.0.2 WAR.


Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2011-06-20 16:42:07 UTC (rev 37098)
+++ labs/jbossesb/trunk/product/install/build.xml	2011-06-20 19:44:50 UTC (rev 37099)
@@ -348,7 +348,7 @@
         </copy>
 
 	<copy todir="${deploy.dir}"
-		file="${org.jboss.esb.dist.lib}/juddiv3-310-SNAPSHOT.war"/>
+		file="${org.jboss.esb.dist.lib}/juddiv3.war"/>
 
 
 	<copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>

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

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-20 16:42:07 UTC (rev 37098)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-20 19:44:50 UTC (rev 37099)
@@ -8,7 +8,7 @@
     <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-jaxws21.jar"/>
-    <property name="juddi.v3.war" value="juddiv3-3.0.2.war"/>
+    <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"/>
 
@@ -316,6 +316,13 @@
     	<property name="juddiv3.war.file" location="${org.jboss.esb.rosetta.distrib.dir}/lib/${org.jboss.esb.registry.war.name}"/>
 
     	<delete file="${juddiv3.war.file}" quiet="true"/>
+	<zip destfile="${juddiv3.war.file}">
+	    <zipfileset dir="${org.jboss.esb.registry.war.resources.dir}/WEB-INF"
+		includes="jboss-web.xml" fullpath="WEB-INF/jboss-web.xml"/>
+            <zipfileset src="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}"/>
+	</zip>
+
+	<!--	
         <zip destfile="${juddiv3.war.file}">
             <zipfileset dir="${org.jboss.esb.registry.war.resources.dir}"/>
             <zipfileset dir="${juddi.v3.wsdl.dir}" prefix="WEB-INF/wsdl"/>
@@ -324,7 +331,8 @@
                 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>
+	-->
 	
-	<copy file="${org.jboss.esb.ext.lib.dir}/juddiv3-310-SNAPSHOT.war" todir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
+	<copy file="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}" todir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
     </target>
 </project>