[jboss-svn-commits] JBL Code SVN: r16586 - labs/jbossesb/trunk/product/samples/quickstarts/conf.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 14 06:09:12 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-11-14 06:09:12 -0500 (Wed, 14 Nov 2007)
New Revision: 16586
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Always use target server for classpath: JBESB-1335
Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml 2007-11-14 11:08:59 UTC (rev 16585)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml 2007-11-14 11:09:12 UTC (rev 16586)
@@ -68,7 +68,7 @@
<target name="messaging-config">
<property name="org.jboss.esb.server.deploy.dir"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+ value="${org.jboss.esb.server.server}/deploy"/>
<condition property="messaging.present">
<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
@@ -115,18 +115,42 @@
<!-- ==================================================================== -->
<!-- This section handles dependencies specific to each distribution. -->
<!-- It configures the following properties -->
-<!-- org.jboss.esb.server.config, org.jboss.esb.server.home and -->
-<!-- deployment-classpath -->
+<!-- org.jboss.esb.server.config, org.jboss.esb.server.home, -->
+<!-- org.jboss.esb.server.server and deployment-classpath -->
<!-- ==================================================================== -->
<!-- Configure dependencies for jbossesb and source distributions -->
- <target name="jbossesb-dependencies" if="build.jbossesb">
- <condition property="base.jbossesb"
- value="${product.dir}/build/jbossesb"
- else="${product.dir}">
- <isset property="hierarchy.source"/>
- </condition>
+ <target name="jbossesb-dependencies" depends="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}"/>
+ <path id="deployment-classpath">
+ <fileset dir="${org.jboss.esb.server.server}/deploy/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"/>
+ <!-- jbpm config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/jbpm.esb"/>
+ <pathelement location="${org.jboss.esb.server.server}/lib/cglib.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"/>
+ <!-- jbrules config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbrules.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/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"/>
+ <!-- soap config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+ <!-- general libs -->
+ <pathelement location="${org.jboss.esb.server.server}/lib/commons-logging.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/lib/jboss-system.jar"/>
+ </path>
+ </target>
+
+ <target name="jbossesb-source-dependencies" if="build.jbossesb">
<condition
property="org.jboss.esb.server.config"
value="${quickstart.org.jboss.esb.server.config}">
@@ -158,60 +182,13 @@
<fail unless="org.jboss.esb.server.home" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>
- <path id="deployment-classpath">
- <fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
- <fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
- <!-- jbossesb config -->
- <fileset dir="${base.jbossesb}/lib/jbossesb.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbossesb.esb"/>
- <!-- jbpm config -->
- <fileset dir="${base.jbossesb}/lib/jbpm.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbpm.esb"/>
- <!-- smooks config -->
- <fileset dir="${base.jbossesb}/lib/smooks.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/smooks.esb"/>
- <!-- jbrules config -->
- <fileset dir="${base.jbossesb}/lib/jbrules.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbrules.esb"/>
- <!-- spring config -->
- <fileset dir="${base.jbossesb}/lib/spring.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/spring.esb"/>
- <!-- soap config -->
- <fileset dir="${base.jbossesb}/lib/soap.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/soap.esb"/>
- </path>
+ <property name="org.jboss.esb.server" location="${product.dir}/server/${org.jboss.esb.server.config}"/>
</target>
<!-- Configure dependencies for jbossesb-server distribution -->
<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
<property name="org.jboss.esb.server.home" value="${product.dir}"/>
<property name="org.jboss.esb.server.config" value="default"/>
-
- <path id="deployment-classpath">
- <fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
- <!-- jbossesb config -->
- <fileset dir="${product.dir}/server/default/deploy/jbossesb.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbossesb.esb"/>
- <!-- jbpm config -->
- <fileset dir="${product.dir}/server/default/deploy/jbpm.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbpm.esb"/>
- <pathelement location="${product.dir}/server/default/lib/cglib.jar"/>
- <!-- smooks config -->
- <fileset dir="${product.dir}/server/default/deploy/smooks.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/smooks.esb"/>
- <!-- jbrules config -->
- <fileset dir="${product.dir}/server/default/deploy/jbrules.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbrules.esb"/>
- <!-- spring config -->
- <fileset dir="${product.dir}/server/default/deploy/spring.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/spring.esb"/>
- <!-- soap config -->
- <fileset dir="${product.dir}/server/default/deploy/soap.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/soap.esb"/>
- <!-- general libs -->
- <pathelement location="${product.dir}/server/default/lib/commons-logging.jar"/>
- <pathelement location="${product.dir}/lib/jboss-system.jar"/>
- </path>
</target>
<!-- ==================================================================== -->
@@ -220,12 +197,13 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+ <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
<path refid="quickstart-dependencies-classpath" />
<path refid="quickstart-lib-classpath" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
<path refid="deployment-classpath" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
</path>
@@ -234,12 +212,11 @@
<pathelement location="." />
<pathelement location="${classes}" />
<pathelement location="${basedir}/src" />
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+ <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.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.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. -->
<path refid="compile-classpath" />
<pathelement location="${pwd}/anttasks/classes" />
</path>
@@ -422,7 +399,7 @@
<!-- ==================================================================== -->
<target name="assert-ws-available">
- <available property="ws-spi" file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/jbossws-spi.jar"/>
+ <available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
<condition property="ws-available">
More information about the jboss-svn-commits
mailing list