[jboss-svn-commits] JBL Code SVN: r10443 - in labs/jbossesb/branches/JBESB_4_0_MP1/product: docs and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 22 14:34:13 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-03-22 14:34:13 -0400 (Thu, 22 Mar 2007)
New Revision: 10443
Modified:
labs/jbossesb/branches/JBESB_4_0_MP1/product/
labs/jbossesb/branches/JBESB_4_0_MP1/product/build.xml
labs/jbossesb/branches/JBESB_4_0_MP1/product/docs/GettingStarted.odt
labs/jbossesb/branches/JBESB_4_0_MP1/product/install/build.xml
labs/jbossesb/branches/JBESB_4_0_MP1/product/install/deployment.properties-example
Log:
http://jira.jboss.com/jira/browse/JBESB-470, Updating for new standalone-server and .esb deployment
Property changes on: labs/jbossesb/branches/JBESB_4_0_MP1/product
___________________________________________________________________
Name: svn:ignore
- build
deployment.properties
javadocs
*.bat
ObjectToFileWriter.tst
*.log
test-outdir
+ build
deployment.properties
javadocs
*.bat
ObjectToFileWriter.tst
*.log
test-outdir
foobar
Modified: labs/jbossesb/branches/JBESB_4_0_MP1/product/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_0_MP1/product/build.xml 2007-03-22 18:32:11 UTC (rev 10442)
+++ labs/jbossesb/branches/JBESB_4_0_MP1/product/build.xml 2007-03-22 18:34:13 UTC (rev 10443)
@@ -354,6 +354,7 @@
</target>
<target name="dist" depends="tools">
<runant target="org.jboss.esb.dist"/>
+ <ant antfile="build-distr.xml" target="dist" />
</target>
<target name="tools">
<runant target="org.jboss.esb.tools"/>
Modified: labs/jbossesb/branches/JBESB_4_0_MP1/product/docs/GettingStarted.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_0_MP1/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_0_MP1/product/install/build.xml 2007-03-22 18:32:11 UTC (rev 10442)
+++ labs/jbossesb/branches/JBESB_4_0_MP1/product/install/build.xml 2007-03-22 18:34:13 UTC (rev 10443)
@@ -2,218 +2,19 @@
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
-
- <property name="org.jboss.esb.deployment.conf" location="conf"/>
<property name="org.jboss.esb.deployment.deploy" location="deploy"/>
- <property name="org.jboss.esb.deployment.data" location="data"/>
+
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <target name="deploy" depends="jboss.sar.all.deploy" description="Wrapper for jboss.sar.deploy"/>
- <target name="undeploy" depends="jboss.sar.all.undeploy" description="Wrapper for jboss.sar.undeploy"/>
+ <target name="deploy" depends="sar.deploy" description="Wrapper for jboss.sar.deploy"/>
<target name="tomcat" depends="tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
- <target name="standalone" depends="standalone.install" description="Wrapper for standalone.install">
- <antcall target="deploy" />
- </target>
-
- <!-- Check if the user wants to deploy the config -->
- <target name="jboss.config.check">
- <condition property="config.jboss.isset">
- <equals arg1="${org.jboss.esb.config.saronly.set}" arg2="true" trim="true"/>
- </condition>
- </target>
-
- <target name="jboss.config.deploy" unless="config.jboss.isset" description="Deploys the JBossESB configuration">
-
- <!-- conf -->
- <copy file="${org.jboss.esb.deployment.conf}/log4j.xml" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf" />
- <copy file="${org.jboss.esb.deployment.conf}/jbossesb-properties.xml" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf" />
- <copy file="${org.jboss.esb.deployment.conf}/jbossesb.xml" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf" />
- <copy file="${org.jboss.esb.deployment.conf}/juddi.properties" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf" />
- <!-- data -->
- <copy file="${org.jboss.esb.deployment.data}/hypersonic/default.data" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" />
- <copy file="${org.jboss.esb.deployment.data}/hypersonic/default.properties" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" />
- <copy file="${org.jboss.esb.deployment.data}/hypersonic/default.script" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" />
- <!-- deploy -->
- <copy file="${org.jboss.esb.deployment.deploy}/hsqldb-ds.xml" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy" />
- </target>
-
- <target name="jboss.config.undeploy" unless="config.jboss.isset" description="Undeploys JBossESB configuration">
- <echo>Please shutdown jboss before running this task!</echo>
-
- <!-- conf -->
- <echo>Deleting jbossesb configuration</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf" includes="jbossesb*.*"/>
- </delete>
- <echo>Deleting juddi properties file</echo>
- <delete file="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf/juddi.properties"/>
- <!-- data -->
- <echo>Deleting hypersonic data</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" includes="default*"/>
- </delete>
- <!-- deploy -->
- <copy file="${org.jboss.esb.deployment.deploy}/hsqldb-ds.xml-original" overwrite="true"
- tofile="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/hsqldb-ds.xml" />
- </target>
-
- <target name="jboss.sar.all.deploy" depends="build.sar,jboss.config.check,jboss.config.deploy" description="Deploys JBossESB configuration and 2 JBossESB sars to JBossAS">
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy">
- <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb-dependencies.sar/**"/></copy>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy">
- <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb-registry.sar/**"/></copy>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy">
+ <target name="sar.deploy" description="Deploys JBossESB to the server">
+ <copy todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
<fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb.sar/**"/></copy>
</target>
- <target name="jboss.sar.all.undeploy" depends="jboss.config.check,jboss.config.undeploy" description="Undeploys JBossESB configuration and 2 JBossESB sars">
- <echo>Deleting jbossesb-dependencies.sar</echo>
- <delete dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar"/>
- <echo>Deleting jbossesb.sar</echo>
- <delete dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb.sar"/>
- <delete dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-registry.sar"/>
- </target>
-
- <target name="jboss.sar.jbossrules.deploy" description="Deploys JBoss Rules to the jbossesb-dependencies.sar">
- <echo>Deploy JBoss Rules to jbossesb-dependencies.sar</echo>
- <echo>This tasks will only succeed if you already have an existing jbossesb-dependencies.sar</echo>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/ext"
- includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
- drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
- commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
- </copy>
- </target>
-
- <target name="jboss.sar.jbossrules.undeploy" description="Undeploys JBoss Rules from the jbossesb-dependencies.sar">
- <echo>Deleting JBoss Rules from jbossesb-dependencies.sar</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar"
- includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
- drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
- commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
- </delete>
- <echo>Please update your jbossesb-properties.xml, if you want to use a different Content Based Routing engine.</echo>
- </target>
-
- <property name="smooks.dependencies" value="milyn-*.jar,opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar" />
- <target name="jboss.sar.smooks.deploy" description="Deploys Milyn Smooks to the jbossesb-dependencies.sar">
- <echo>Deploy Milyn Smooks to jbossesb-dependencies.sar</echo>
- <echo>This tasks will only succeed if you already have an existing jbossesb-dependencies.sar</echo>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="${smooks.dependencies}"/>
- </copy>
- <copy file="${org.jboss.esb.deployment.conf}/smooks-cdr.lst" overwrite="true"
- todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar" />
- </target>
-
- <target name="jboss.sar.smooks.undeploy" description="Undeploys Milyn Smooks from the jbossesb-dependencies.sar">
- <echo>Deleting Milyn Smooks from jbossesb-dependencies.sar</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar"
- includes="${smooks.dependencies}"/>
- </delete>
- <delete file="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar/smooks-cdr.lst" />
- </target>
-
- <target name="jboss.sar.registry.deploy" description="Deploys the jUDDI Registry to the jbossesb-dependencies.sar">
- <echo>Deploy the jUDDI Registry to jbossesb-dependencies.sar</echo>
- <echo>This tasks will only succeed if you already have an existing jbossesb-dependencies.sar</echo>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
- </copy>
- </target>
-
- <target name="jboss.sar.registry.undeploy" description="Undeploys the jUDDI Registry from the jbossesb-dependencies.sar">
- <echo>Deleting the jUDDI Registry from jbossesb-dependencies.sar</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar"
- includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
- </delete>
- <echo>Please update your jbossesb-properties.xml, if you want to use a different Registry.</echo>
- </target>
-
- <target name="jboss.sar.ftp.deploy" description="Deploys edtftpj to the jbossesb-dependencies.sar">
- <echo>Deploy edtftpj to jbossesb-dependencies.sar</echo>
- <echo>This tasks will only succeed if you already have an existing jbossesb-dependencies.sar</echo>
- <copy todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar" includes="edtftpj.jar"/>
- </copy>
- </target>
-
- <target name="jboss.sar.ftp.undeploy" description="Undeploys edtftpj from the jbossesb-dependencies.sar">
- <echo>Deleting edtftpj from jbossesb-dependencies.sar</echo>
- <delete>
- <fileset dir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy/jbossesb-dependencies.sar"
- includes="edtftpj.jar"/>
- </delete>
- </target>
-
- <target name="jboss.sar.minimal.deploy"
- depends="jboss.sar.all.deploy,jboss.sar.smooks.undeploy,jboss.sar.jbossrules.undeploy,jboss.sar.ftp.undeploy"
- description="Deploys the JBossESB sars with just the scout/juddi Registry"/>
-
- <target name="build.sar">
- <echo message="Building JBoss ESB sar files"/>
- <delete dir="${org.jboss.esb.dist.lib}/jbossesb.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb.sar/META-INF" />
- <copy file="jboss-service.xml"
- todir="${org.jboss.esb.dist.lib}/jbossesb.sar/META-INF"/>
- <delete dir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar/META-INF" />
- <copy todir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar">
- <!-- jaxr and scout -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="jaxr-api-1.0-SNAPSHOT.jar,
- scout-1.0-SNAPSHOT.jar"/>
- <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb-registry.jar"/>
- </copy>
- <copy file="jboss-service-registry.xml"
- tofile="${org.jboss.esb.dist.lib}/jbossesb-registry.sar/META-INF/jboss-service.xml"/>
-
- <echo message="Building JBoss ESB dependencies sar file"/>
- <delete dir="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar" />
- <mkdir dir="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar/META-INF" />
- <copy file="jboss-service-dependencies.xml"
- tofile="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar/META-INF/jboss-service.xml"/>
- <copy todir="${org.jboss.esb.dist.lib}/jbossesb-dependencies.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="jbossts-common.jar"/>
- <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb*.jar"
- excludes="jbossesb-registry.jar" />
- <!-- xbean for reading/marchalling xml for configuration, and scout -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
- <!-- jUDDI Registry -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
- <!-- jboss rules for CBR -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
- drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
- commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
- <!-- smooks for transformation -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="${smooks.dependencies}"/>
- <fileset dir="${org.jboss.esb.deployment.conf}" includes="smooks-cdr.lst" />
- <!-- ftp -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="edtftpj.jar"/>
- </copy>
- </target>
-
- <!-- Standalone JBossESB -->
- <target name="standalone.install" description="installs the jbosseb standalone">
- <echo>This task creates a ready-to-go JBossESB install</echo>
- <unzip src="standalone/jboss-4.0.5.GA.zip" dest="${org.jboss.esb.appserver.home}/../" />
- </target>
-
<!-- Tomcat war deployment -->
<path id="classpath">
<fileset dir="${org.jboss.esb.dist.lib}" includes="**/*jar"/>
@@ -280,7 +81,7 @@
<target name="install.jboss" unless="is.not.bundle" depends="check.is.bundle">
<echo>This task creates a ready-to-go JBossESB install deployed in /JBoss-4.0.5.GA (on the root
of your file system) if you have downloaded the bundle.</echo>
- <unzip src="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" dest="${org.jboss.esb.appserver.home}/../" />
+ <unzip src="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" dest="${org.jboss.esb.server.home}/../" />
</target>
Modified: labs/jbossesb/branches/JBESB_4_0_MP1/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/branches/JBESB_4_0_MP1/product/install/deployment.properties-example 2007-03-22 18:32:11 UTC (rev 10442)
+++ labs/jbossesb/branches/JBESB_4_0_MP1/product/install/deployment.properties-example 2007-03-22 18:34:13 UTC (rev 10443)
@@ -4,12 +4,13 @@
# Copy the example file and replace with your values
#
######################################################################
-# the place where the jbossesb libraries can be found
+#
# Note: You should not need to change this entry unless you altered
# the jbossesb distribution directory structure, however if you check out from SVN you will
-# have to run the 'ant dist' target to build these jars, and it that
-# case use: org.jboss.esb.dist.lib=../build/jbossesb/lib
-org.jboss.esb.dist.lib=../lib
+# have to run the 'ant dist' target, and it that
+# case use: org.jboss.esb.dist.lib=../build
+#
+org.jboss.esb.dist=../
######################################################################
# You can use three deployment options: deploy to JBossAS, Tomcat or
@@ -18,15 +19,11 @@
######################################################################
# JBossAS
######################################################################
-# JBossAS home directory
+# Server home directory
# (By default the 'ant install' task will create this directory.)
-org.jboss.esb.appserver.home=/jboss-4.0.5.GA
+org.jboss.esb.server.home=/jbossesb-server-4.0.1
# the instance of jboss you are running (default)
org.jboss.esb.appserver.config=default
-# if at a later stage you don't want to redeploy the config anymore
-# with every deploy, but rather the sar only (not the configuration)
-# then uncomment the following
-#org.jboss.esb.config.saronly.set=true
######################################################################
# Tomcat
######################################################################
More information about the jboss-svn-commits
mailing list