[overlord-commits] Overlord SVN: r673 - in cdl/trunk: distribution/src/main/assembly and 11 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sat Jul 18 13:10:38 EDT 2009
Author: jeff.yuchang
Date: 2009-07-18 13:10:37 -0400 (Sat, 18 Jul 2009)
New Revision: 673
Added:
cdl/trunk/runtime/jbossesb/src/main/configs/
cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/
cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/deployment.xml
cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/jboss-esb.xml
cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
Removed:
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/
Modified:
cdl/trunk/distribution/pom.xml
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/install/build.xml
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/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml
cdl/trunk/distribution/src/main/release/version.properties
cdl/trunk/runtime/jbossesb/pom.xml
Log:
SOAG-110
Modified: cdl/trunk/distribution/pom.xml
===================================================================
--- cdl/trunk/distribution/pom.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/pom.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -38,12 +38,6 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
- <artifactId>cdl-jbossesb-assembly</artifactId>
- <version>${pom.version}</version>
- <type>esb</type>
- </dependency>
- <dependency>
<groupId>org.jboss.soa.overlord.cdl.validator</groupId>
<artifactId>cdl-validator-jbossesb</artifactId>
<version>${pom.version}</version>
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -37,13 +37,16 @@
<directory>validator/jbossesb</directory>
<outputDirectory>modules/validator-jbossesb-${cdl.version}</outputDirectory>
</fileSet>
-
+
+ <fileSet>
+ <directory>../runtime/jbossesb/target</directory>
+ <outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory>
+ <includes>
+ <include>overlord-cdl-runtime.esb.zip</include>
+ </includes>
+ </fileSet>
+
<fileSet>
- <directory>../runtime/jbossesb-assembly/target/overlord-cdl-runtime-jbossesb</directory>
- <outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory>
- </fileSet>
-
- <fileSet>
<directory>../validator/jbossesb-assembly/target/overlord-cdl-validator-jbossesb</directory>
<outputDirectory>modules/validator-jbossesb-${cdl.version}/overlord-cdl-validator.esb</outputDirectory>
</fileSet>
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -27,9 +27,7 @@
<target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server">
<echo message="Deploy overlord cdl runtime to JBoss ESB server" />
- <copy todir="${deploy.dir}/overlord-cdl-runtime.esb">
- <fileset dir="${modules}/runtime-jbossesb-${cdl.version}" />
- </copy>
+ <unzip src="${modules}/runtime-jbossesb-${cdl.version}/overlord-cdl-runtime.esb.zip" dest="${deploy.dir}" />
</target>
<target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime">
@@ -42,7 +40,7 @@
<ant dir="${modules}/validator-jbossesb-${cdl.version}" target="deploy">
<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}"/>
- </ant>
+ </ant>
</target>
<target name="undeploy-cdl-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server">
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 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="broker-stateless" default="esbjar" basedir=".">
+<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 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="supplier-stateless" default="esbjar" basedir=".">
+<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/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/build.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="jbossesb-stateless" default="deploy-purchasing" basedir=".">
+<project name="jbossesb" default="deploy-purchasing" basedir=".">
<target name="deploy-purchasing" >
<ant dir="purchasing/store" target="deploy" />
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 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="creditAgency-stateless" default="esbjar" basedir=".">
+<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/purchasing/store/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="purchasing-store-stateless" default="esbjar" basedir=".">
+<project name="purchasing-store" default="esbjar" basedir=".">
- <import file="../../../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/version.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/version.properties 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/distribution/src/main/release/version.properties 2009-07-18 17:10:37 UTC (rev 673)
@@ -1 +1 @@
-cdl.version=1.0-M2
+cdl.version=1.0-SNAPSHOT
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2009-07-18 10:28:07 UTC (rev 672)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -43,7 +43,27 @@
<build>
<plugins>
- <plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>config</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>overlord-cdl-runtime.esb</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/configs/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -79,7 +99,7 @@
<encoding>UTF-8</encoding>
<locale>en_US</locale>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/deployment.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/deployment.xml (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/deployment.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+ <depends>jboss.esb:deployment=jbossesb.esb</depends>
+</jbossesb-deployment>
Added: cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/jboss-esb.xml (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/META-INF/jboss-esb.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -0,0 +1,24 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2008, JBoss Inc., and others contributors as indicated
+ by the @authors tag. All rights reserved.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2008,
+-->
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
+ parameterReloadSecs="500">
+
+</jbossesb>
Added: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-07-18 17:10:37 UTC (rev 673)
@@ -0,0 +1,28 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/configs/META-INF</directory>
+ <outputDirectory>/META-INF</outputDirectory>
+ <includes>
+ <include>deployment.xml</include>
+ <include>jboss-esb.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
More information about the overlord-commits
mailing list