[jboss-svn-commits] JBL Code SVN: r29702 - in labs/jbossesb/trunk/product: samples/quickstarts/conf and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2009-10-20 12:49:31 -0400 (Tue, 20 Oct 2009)
New Revision: 29702

Modified:
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Move jars back to server/XXX/lib: JBESB-2895

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2009-10-20 16:40:36 UTC (rev 29701)
+++ labs/jbossesb/trunk/product/install/build.xml	2009-10-20 16:49:31 UTC (rev 29702)
@@ -166,10 +166,10 @@
 	        <copy file="${org.jboss.esb.dist.lib}/contract.war" todir="${deploy.dir}" />
 
 	        <!-- install h2 jar -->
-	        <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+	        <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}" overwrite="true"/>
 		
 	        <!-- copy JBoss Identity jars -->
-			<copy todir="${server.lib.dir}" overwrite="true">
+                <copy todir="${server.lib.dir}" overwrite="true">
 	            <fileset dir="${org.jboss.esb.dist.lib}">
 	                <include name="jboss-identity-*.jar"/>
 	                <include name="xmlsec-*.jar"/>
@@ -248,7 +248,7 @@
             </fileset>
 		</copy>
 		
-		<copy todir="${org.jboss.esb.server.home}/common/lib" overwrite="true">
+        <copy todir="${server.lib.dir}" overwrite="true">
             <fileset dir="${product.dir}/build/lib">
                 <include name="jboss-identity-*.jar"/>
                 <include name="xmlsec-*.jar"/>
@@ -341,7 +341,7 @@
 	        <copy file="${org.jboss.esb.dist.lib}/contract.war" todir="${deploy.dir}" />
 
 	        <!-- install h2 jar -->
-	        <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${org.jboss.esb.server.home}/common/lib" overwrite="true"/>
+	        <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}" overwrite="true"/>
 		
     		<copy file="${org.jboss.esb.dist.lib}/scout-1.0.jar" tofile="${client.dir}/scout.jar" overwrite="true"/>
 
@@ -358,7 +358,7 @@
 	        
 	    </target>
 
-    <target name="undeploy" depends="check.deploy.props, undeploy.bindings" description="Undeploy ESB components.">
+    <target name="undeploy" depends="check.deploy.props, undeploy.bindings, undeploy.jbossas5" description="Undeploy ESB components.">
         <delete dir="${deploy.dir}/jbossesb.sar" quiet="true"/>
         <delete dir="${deploy.dir}/jbossesb.esb" quiet="true"/>
         <delete dir="${deploy.dir}/jbpm.esb" quiet="true"/>
@@ -377,21 +377,13 @@
 			<fileset dir="${server.lib.dir}" >
                 <include name="jboss-identity-*.jar"/>
                 <include name="xmlsec-*.jar"/>
+                <include name="commons-httpclient*.jar"/>
             </fileset>
         </delete>
-    	<antcall target="undeploy.jbossas5"/>
     </target>
 	
 	<target name="undeploy.jbossas5" if="jbossas5" >
         <delete dir="${server.dir}/deployers/esb.deployer" quiet="true"/>
-		
-        <delete quiet="false">
-			<fileset dir="${org.jboss.esb.server.home}/common/lib" >
-                <include name="jboss-identity-*.jar"/>
-                <include name="xmlsec-*.jar"/>
-            </fileset>
-        </delete>
-		
     </target>
 
         <property name="org.jboss.esb.tomcat.55lib"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-10-20 16:40:36 UTC (rev 29701)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-10-20 16:49:31 UTC (rev 29702)
@@ -264,7 +264,7 @@
             <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar"/>
 
             <!-- common lib jars -->
-            <fileset dir="${org.jboss.esb.server.common.lib}" includes="commons-httpclient.jar"/>
+            <fileset dir="${org.jboss.esb.server.server}/lib" includes="commons-httpclient*.jar"/>
         </path>
     </target>