[overlord-commits] Overlord SVN: r315 - in cdl/trunk: distribution/src/main/release/install and 6 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sun Sep 7 12:03:46 EDT 2008
Author: jeff.yuchang
Date: 2008-09-07 12:03:45 -0400 (Sun, 07 Sep 2008)
New Revision: 315
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/install/build.xml
cdl/trunk/distribution/src/main/release/install/deployment.properties
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
cdl/trunk/samples/jbossesb/trailblazer/build.xml
cdl/trunk/samples/pom.xml
Log:
* update bin.xml to take out jbossesb folder in samples.
* update deployment.properties, so that trailblazer can reuse the libraries that existed in JBossESB.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -42,8 +42,16 @@
<fileSet>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/release/install</directory>
+ <outputDirectory>/install</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>../docs/cdl/user</directory>
<outputDirectory>docs</outputDirectory>
@@ -52,8 +60,13 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/release/samples/jbossesb</directory>
+ <outputDirectory>samples</outputDirectory>
+ </fileSet>
+
<fileSet>
- <directory>../samples</directory>
+ <directory>../samples/jbossesb</directory>
<outputDirectory>samples</outputDirectory>
<includes>
<include>**/*</include>
@@ -68,13 +81,12 @@
<exclude>**/target/**/*</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>samples/jbossesb/libs</outputDirectory>
+ <outputDirectory>samples/libs</outputDirectory>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
<include>org.jboss.jbossesb:rosetta</include>
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,7 +2,6 @@
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
- <property name="org.jboss.esb.deployment.deploy" location="deploy"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
Modified: cdl/trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-09-07 16:03:45 UTC (rev 315)
@@ -12,4 +12,6 @@
# The Configuration of JBoss AS to Use
# (e.g. default)
org.jboss.esb.server.config=default
-
+# The directory for JBossESB home
+# (e.g. /var/local/jbossesb-4.3.GA)
+org.jboss.esb.home=/var/local/jbossesb-4.3.GA
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="broker" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="supplier" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="creditAgency" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -1,9 +1,14 @@
<project name="base-build" basedir=".">
+
+ <property file="../../../install/deployment.properties" />
+
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
- <property name="libs" value="../libs" />
+ <property name="libs" value="../../libs" />
<property name="src" value="src" />
-
+
+ <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+
<path id="compile-classpath">
<fileset dir="${libs}" includes="*.jar" />
</path>
@@ -17,7 +22,7 @@
</target>
<target name="compile" depends="init">
- <mkdir dir="${classes}" />
+ <mkdir dir="${classes}" />
<javac srcdir="${src}" destdir="${classes}" debug="true" deprecation="true">
<classpath refid="compile-classpath" />
</javac>
@@ -38,7 +43,11 @@
</target>
<target name="deploy" depends="esbjar">
- <copy todir="${org.jboss.esb.server.deploy.dir}"
+ <copy todir="${server.dir}/deploy"
file="${build.dir}/${ant.project.name}.esb"/>
</target>
+
+ <target name="undeploy">
+ <delete file="${server.dir}/deploy/${ant.project.name}.esb" />
+ </target>
</project>
Modified: cdl/trunk/samples/jbossesb/trailblazer/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/samples/jbossesb/trailblazer/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,14 +2,12 @@
<!-- UPDATE THIS WITH YOUR JBOSS_HOME AND SERVER -->
<property name="trailblazer.dir" location="."/>
- <property name="esb.home.dir" value="${trailblazer.dir}/../.."/>
-
- <property name="install.dir" value="${esb.home.dir}/install"/>
+ <property name="install.dir" value="../../install"/>
<property file="${install.dir}/deployment.properties"/>
- <property name="org.jboss.esb.server.home" value="/home/jeffyu/deploy/jboss-4.2.2.GA"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- <property name="trailblazer.dir" value="."/>
+ <property name="esb.home.dir" value="${org.jboss.esb.home}"/>
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
<!-- properties for the esb part of the trailblazer -->
<property name="esb.dest" value="${basedir}/esb/build"/>
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/samples/pom.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -21,10 +21,10 @@
<modules>
- <module>purchasing/store</module>
- <module>common/creditAgency</module>
- <module>brokerage/broker</module>
- <module>brokerage/supplier</module>
+ <module>jbossesb/purchasing/store</module>
+ <module>jbossesb/common/creditAgency</module>
+ <module>jbossesb/brokerage/broker</module>
+ <module>jbossesb/brokerage/supplier</module>
</modules>
<build>
More information about the overlord-commits
mailing list