[jboss-svn-commits] JBL Code SVN: r23040 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf.

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

Author: kevin.conner at jboss.com
Date: 2008-09-24 05:00:51 -0400 (Wed, 24 Sep 2008)
New Revision: 23040

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
Log:
Remove jgroups/jboss cache: JBESB-1987

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml	2008-09-24 08:58:57 UTC (rev 23039)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml	2008-09-24 09:00:51 UTC (rev 23040)
@@ -79,9 +79,6 @@
 <!-- ==================================================================== -->
 
     <target name="messaging-config" depends="jbossesb-dependencies">
-        <property name="org.jboss.esb.server.deploy.dir" 
-            value="${org.jboss.esb.server.server}/deploy"/>
-
         <condition property="messaging.present">
             <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
         </condition>
@@ -134,29 +131,30 @@
 	<!-- Configure dependencies for jbossesb and source distributions -->
 	<target name="jbossesb-dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-source-dependencies, jbossesb-server-dependencies">
 		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+                <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
 
 		<path id="deployment-classpath">
-			<fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.sar/lib" includes="*.jar"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.sar/lib" includes="*.jar"/>
 			<!-- jbossesb config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/jbossesb.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/>
 			<!-- jbpm config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/jbpm.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/jbpm.esb"/>
 			<pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar"/>
 			<pathelement location="${org.jboss.esb.server.server}/lib/dom4j.jar"/>
 			<!-- smooks config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/smooks.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/smooks.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/smooks.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/smooks.esb"/>
 			<!-- jbrules config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/jbrules.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/jbrules.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/jbrules.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/jbrules.esb"/>
 			<!-- spring config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/spring.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/spring.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/spring.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/spring.esb"/>
 			<!-- soap config -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
-			<pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/soap.esb" includes="*.jar"/>
+			<pathelement location="${org.jboss.esb.server.deploy.dir}/soap.esb"/>
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar"/>
 			<!-- general libs -->
 			<pathelement location="${org.jboss.esb.server.home}/lib/commons-logging.jar"/>
@@ -165,6 +163,11 @@
 			<pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>
 			<pathelement location="${org.jboss.esb.server.server}/lib/jbossts-common.jar"/>
 			<pathelement location="${org.jboss.esb.server.server}/lib/quartz.jar"/>
+                        <!-- includes for read only cache -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-cache*.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/lib/jgroups.jar"/>
+                        <!-- includes for h2 -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="h2*.jar"/>
 		</path>
 	</target>
 
@@ -312,7 +315,7 @@
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
 			<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
-			<fileset dir="${org.jboss.esb.server.server}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+			<fileset dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
 			<path refid="compile-classpath" />
             <pathelement location="${pwd}/anttasks/classes" />
 		</path>
@@ -555,6 +558,11 @@
         <fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server.  Please install version 2.2.2.SP2 or higher: http://repository.jboss.org/jboss/remoting/" />
     </target>
 
+    <target name="assert-jgroups" depends="jbossesb-dependencies">
+        <available property="jgroups-available" file="${org.jboss.esb.server.server}/lib/jgroups.jar"/>
+        <fail unless="jgroups-available" message="Unfortunately this aspect requires jgroups in order to function correctly.  Please target a server instance which contains jgroups.jar"/>
+    </target>
+
     <!-- ==================================================================== -->
 <!-- This section defines properties/targets to be overridden by the      -->
 <!-- quickstart specific build.xml file.                                  -->