[jboss-svn-commits] JBL Code SVN: r16632 - in labs/jbossesb/trunk/product: install and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 15 12:27:39 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-11-15 12:27:39 -0500 (Thu, 15 Nov 2007)
New Revision: 16632
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/install/build.xml
Log:
Defer jbossesb-server configuration to install script: JBESB-1341
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2007-11-15 17:27:26 UTC (rev 16631)
+++ labs/jbossesb/trunk/product/build-distr.xml 2007-11-15 17:27:39 UTC (rev 16632)
@@ -60,47 +60,10 @@
</target>
<target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
- <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
- <fileset dir="${build.dir}/jbossesb.sar">
- <include name="**/*"/>
- </fileset>
- </copy>
-<!--
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="ftp/build">
- <include name="ftp-server.sar/**/*"/>
- </fileset>
- </copy>
--->
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="tools/configeditor/editor/dist">
- <include name="jbossesb-config-editor.war"/>
- </fileset>
- <fileset dir="tools/console/contract-web/build">
- <include name="contract.war"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/server/default/conf">
- <fileset dir="tools/configeditor/editor/resources">
- <include name="action-templates.xml"/>
- </fileset>
- </copy>
- <!-- copy services -->
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
- <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
- <fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
- <fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
- <fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
- <fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
- <fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
- <fileset dir="build/jbossesb/lib" includes="soapui-client.sar/**/*"/>
- </copy>
-
- <!-- initialise the ESB bindings -->
- <ant dir="install" target="deploy.bindings" inheritAll="false">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
+ <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
+ inheritall="false">
+ <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
+ <property name="org.jboss.esb.server.config" value="default"/>
</ant>
<!-- initialise the WS modifications -->
@@ -108,10 +71,6 @@
<property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
<property name="org.jboss.esb.server.config" value="default"/>
</ant>
- <ant dir="install/jbpm-patch" target="replace">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- </ant>
</target>
<target name="unpack.server.zip" unless="skip.server.esb">
@@ -170,6 +129,9 @@
<!-- Quartz -->
<fileset dir="${lib.ext.dir}" includes="quartz*.jar"/>
</copy>
+ <copy todir="${build.lib.dir}">
+ <fileset dir="build" includes="jbossesb.sar/**"/>
+ </copy>
</target>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-11-15 17:27:26 UTC (rev 16631)
+++ labs/jbossesb/trunk/product/build.xml 2007-11-15 17:27:39 UTC (rev 16632)
@@ -406,9 +406,6 @@
<fileset dir="lib/ext" includes="jboss-jaxb-intros.jar"/>
</copy>
<ant antfile="build-distr.xml" target="dist" />
- <copy todir="${org.jboss.esb.internal.jar.dest}">
- <fileset dir="build" includes="jbossesb.sar/**"/>
- </copy>
</target>
<!-- Build the tools into the main dist -->
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2007-11-15 17:27:26 UTC (rev 16631)
+++ labs/jbossesb/trunk/product/install/build.xml 2007-11-15 17:27:39 UTC (rev 16632)
@@ -7,8 +7,10 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
- <property name="hadeploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy-hasingleton"/>
+ <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+ <property name="deploy.dir" value="${server.dir}/deploy"/>
+ <property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
<property name="product.dir" location=".."/>
@@ -146,6 +148,9 @@
<!-- contracts app -->
<copy file="${org.jboss.esb.dist}/tools/contract/contract.war" todir="${deploy.dir}" />
+ <!-- config-editor app -->
+ <copy file="${org.jboss.esb.dist}/tools/configeditor/dist/jbossesb-config-editor.war" todir="${deploy.dir}" />
+ <copy file="${org.jboss.esb.dist}/tools/configeditor/resources/action-templates.xml" todir="${conf.dir}" />
<ant dir="jbpm-patch" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
@@ -164,6 +169,8 @@
<delete dir="${deploy.dir}/soap.esb" />
<delete dir="${deploy.dir}/soapui-client.sar" />
<delete dir="${deploy.dir}/contract.war" />
+ <delete dir="${deploy.dir}/jbossesb-config-editor.war" />
+ <delete dir="${conf.dir}/action-templates.xml" />
</target>
<property name="org.jboss.esb.tomcat.55lib"
More information about the jboss-svn-commits
mailing list