Author: jeff.yuchang Date: 2009-08-23 12:55:05 -0400 (Sun, 23 Aug 2009) New Revision: 795 Removed: cdl/trunk/distribution/src/main/release/version.properties Modified: cdl/trunk/distribution/pom.xml cdl/trunk/distribution/src/files/validator/jbossesb/build.xml cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt cdl/trunk/distribution/src/main/assembly/bin.xml cdl/trunk/distribution/src/main/assembly/docs.xml cdl/trunk/distribution/src/main/release/README.txt cdl/trunk/distribution/src/main/release/install/build.xml cdl/trunk/distribution/src/main/release/install/deployment.properties cdl/trunk/docs/docbook/gettingstartedguide/pom.xml cdl/trunk/docs/docbook/samplesguide/pom.xml cdl/trunk/docs/docbook/userguide/pom.xml cdl/trunk/pom.xml cdl/trunk/samples/jbossesb/README.txt cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml cdl/trunk/samples/jbossesb/purchasing/store/pom.xml cdl/trunk/samples/pom.xml Log: Modified: cdl/trunk/distribution/pom.xml =================================================================== --- cdl/trunk/distribution/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -26,28 +26,68 @@ <version>1.0-SNAPSHOT</version> <url>http://www.jboss.org/overlord/savara</url> + <parent> + <groupId>org.jboss</groupId> + <artifactId>savara</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <properties> <maven.test.skip>true</maven.test.skip> - <cdl.version>${project.version}</cdl.version> </properties> <dependencies> <dependency> - <groupId>org.jboss.savara.runtime</groupId> - <artifactId>jbossesb</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-runtime-jbossesb</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.jboss.savara.validator</groupId> - <artifactId>jbossesb</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-runtime-jbossesb</artifactId> <version>${pom.version}</version> + <classifier>dist</classifier> + <type>zip</type> </dependency> <dependency> - <groupId>org.jboss.savara.validator</groupId> - <artifactId>jbossesb-assembly</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-validator-jbossesb</artifactId> <version>${pom.version}</version> - <type>esb</type> </dependency> + <dependency> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-validator-jbossesb</artifactId> + <version>${pom.version}</version> + <classifier>dist</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> + <artifactId>jbossesb-rosetta</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>sun-jaxws</groupId> + <artifactId>jsr181-api</artifactId> + <version>2.1.1</version> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: cdl/trunk/distribution/src/files/validator/jbossesb/build.xml =================================================================== --- cdl/trunk/distribution/src/files/validator/jbossesb/build.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/files/validator/jbossesb/build.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -41,7 +41,7 @@ <!-- ==================================================================== --> <target name="deploy" depends="register-validator-filter,messaging-dependencies,jbossmq-dependencies"> - <echo message="Deploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files to the target server '${target-server}'." /> + <echo message="Deploy pi4soa.sar, savara-validator-jbossesb.esb files to the target server '${target-server}'." /> <copy todir="${target-server}/deploy/pi4soa.sar"> <fileset dir="${basedir}/pi4soa.sar"> <exclude name="jms/**" /> @@ -49,15 +49,15 @@ </copy> <copy todir="${target-server}/deploy/pi4soa.sar" file="${basedir}/pi4soa.sar/jms/${jms.service.file}" /> - <copy todir="${target-server}/deploy/overlord-cdl-validator.esb"> - <fileset dir="${basedir}/overlord-cdl-validator.esb" /> + <copy todir="${target-server}/deploy/savara-validator-jbossesb.esb"> + <fileset dir="${basedir}/savara-validator-jbossesb.esb" /> </copy> </target> <target name="undeploy" depends="unregister-validator-filter"> - <echo message="Undeploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files from the target sever '${target-server}'."/> + <echo message="Undeploy pi4soa.sar, savara-validator-jbossesb.esb files from the target sever '${target-server}'."/> <delete dir="${target-server}/deploy/pi4soa.sar" /> - <delete dir="${target-server}/deploy/overlord-cdl-validator.esb" /> + <delete dir="${target-server}/deploy/savara-validator-jbossesb.esb" /> </target> <target name="register-validator-filter"> @@ -71,6 +71,5 @@ <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" /> <copy file="${basedir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" /> </target> - </project> Modified: cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt =================================================================== --- cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/files/validator/jbossesb/readme.txt 2009-08-23 16:55:05 UTC (rev 795) @@ -5,7 +5,7 @@ ----------------------- 1 - pi4soa.sar -2 - overlord-cdl-validator.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter. +2 - savara-validator-jbossesb.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter. 3 - conf/ It contains the proper configuration for governance deployment. @@ -15,11 +15,11 @@ Instructions for deploying/undeploying by using ANT (recommended) ------------------------------------------------------------------ -1 - Go to $overlord-cdl/install directory. +1 - Go to $savara/install directory. -2 - Run "ant deploy-cdl-validator" to deploy the validator libraries. +2 - Run "ant deploy-savara-validator" to deploy the validator libraries. -3 - Run "ant undeploy-cdl-validator" to undeploy the validator libraries. +3 - Run "ant undeploy-savara-validator" to undeploy the validator libraries. Modified: cdl/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -29,18 +29,14 @@ <fileSets> <fileSet> - <directory>eclipse</directory> + <directory>src/files/eclipse</directory> <outputDirectory>tools</outputDirectory> </fileSet> - - <fileSet> - <directory>../runtime/jbossesb/target</directory> - <outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory> - <includes> - <include>savara-runtime.esb-dist.zip</include> - </includes> - </fileSet> - + + <fileSet> + <directory>src/files/validator/jbossesb</directory> + <outputDirectory>modules/savara-validator-jbossesb</outputDirectory> + </fileSet> <!--Copy files like License and samples etc --> <fileSet> @@ -57,6 +53,148 @@ <outputDirectory>/install</outputDirectory> </fileSet> + <!-- copy documents --> + <fileSet> + <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/userguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/samplesguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/gettingstartedguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../runtime/jbossesb/target/javadoc</directory> + <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory> + </fileSet> + + <fileSet> + <directory>../validator/jbossesb/target/javadoc</directory> + <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory> + </fileSet> + <!-- End of copying documents --> + + <!-- copy samples --> + + <fileSet> + <directory>src/main/release/samples/jbossesb</directory> + <outputDirectory>samples</outputDirectory> + </fileSet> + + <!-- Copy the cdl model for examples --> + <fileSet> + <directory>../samples/jbossesb/brokerage/models</directory> + <outputDirectory>samples/models/brokerage</outputDirectory> + <excludes> + <exclude>**/.project</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../samples/jbossesb/purchasing/models</directory> + <outputDirectory>samples/models/purchasing</outputDirectory> + <excludes> + <exclude>**/.project</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>../samples/jbossesb/brokerage/broker/src</directory> + <outputDirectory>samples/brokerage/broker/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../samples/jbossesb/brokerage/supplier/src</directory> + <outputDirectory>samples/brokerage/supplier/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../samples/jbossesb/purchasing/store/src</directory> + <outputDirectory>samples/purchasing/store/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../samples/jbossesb/common/creditAgency/src</directory> + <outputDirectory>samples/common/creditAgency/src</outputDirectory> + </fileSet> + + <!-- copy client & trailblazer example--> + <fileSet> + <directory>../samples/jbossesb/client</directory> + <outputDirectory>samples/client</outputDirectory> + </fileSet> + <fileSet> + <directory>../samples/jbossesb/trailblazer</directory> + <outputDirectory>samples/trailblazer</outputDirectory> + </fileSet> + <!-- End of copying examples --> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>modules</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.savara:savara-runtime-jbossesb:zip:dist</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>modules/savara-validator-jbossesb</outputDirectory> + <unpack>true</unpack> + <includes> + <include>org.jboss.savara:savara-validator-jbossesb:zip:dist</include> + </includes> + </dependencySet> + + <!-- Need to copy libraries into each of the samples Eclipse projects + as the jars must be referenced locally within each project. The + versions have been removed from the jars, as the Eclipse projects + need to explicitly refer to each Jar in the .classpath file, so + removing the version from the name avoids having to find a way + to automatically update the .classpath file --> + <dependencySet> + <outputDirectory>samples/brokerage/broker/lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.savara:savara-runtime-jbossesb</include> + <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include> + <include>log4j:log4j</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>samples/brokerage/supplier/lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.savara:savara-runtime-jbossesb</include> + <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include> + <include>log4j:log4j</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>samples/purchasing/store/lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.savara:savara-runtime-jbossesb</include> + <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include> + <include>log4j:log4j</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>samples/common/creditAgency/lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.jboss.savara:savara-runtime-jbossesb</include> + <include>org.jboss.overlord.dependencies.org.jboss.esb:jbossesb-rosetta</include> + <include>log4j:log4j</include> + <include>sun-jaxws:jaxws-api</include> + <include>javax.xml.bind:jaxb-api</include> + <include>sun-jaxws:jsr181-api</include> + </includes> + </dependencySet> + + </dependencySets> </assembly> Modified: cdl/trunk/distribution/src/main/assembly/docs.xml =================================================================== --- cdl/trunk/distribution/src/main/assembly/docs.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/assembly/docs.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -25,27 +25,32 @@ <formats> <format>zip</format> </formats> - + <fileSets> - <fileSet> - <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/userguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/samplesguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> - <outputDirectory>docs/gettingstartedguide</outputDirectory> - </fileSet> - - <fileSet> - <directory>../runtime/jbossesb/target/javadoc</directory> - <outputDirectory>docs/jbossesb-javadoc</outputDirectory> - </fileSet> + <fileSet> + <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/userguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/samplesguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/gettingstartedguide</outputDirectory> + </fileSet> + + <fileSet> + <directory>../runtime/jbossesb/target/javadoc</directory> + <outputDirectory>docs/savara-runtime-jbossesb-javadoc</outputDirectory> + </fileSet> + + <fileSet> + <directory>../validator/jbossesb/target/javadoc</directory> + <outputDirectory>docs/savara-validator-jbossesb-javadoc</outputDirectory> + </fileSet> </fileSets> Modified: cdl/trunk/distribution/src/main/release/README.txt =================================================================== --- cdl/trunk/distribution/src/main/release/README.txt 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/release/README.txt 2009-08-23 16:55:05 UTC (rev 795) @@ -1,8 +1,8 @@ -Overlord CDL README +Savara README =================== Please refer to the Installation section, within the Getting Started Guide in the docs -folder, which explains how to install the Overlord CDL governance capabilities into the +folder, which explains how to install the CDL governance capabilities into the JBossESB environment. If you are new to SOA Governance using CDL, then please refer to the Getting Started Modified: cdl/trunk/distribution/src/main/release/install/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -1,11 +1,10 @@ -<project name="Overlord_CDL_Installer" default="deploy-cdl-runtime" basedir="."> +<project name="Overlord_CDL_Installer" default="deploy-savara-runtime" basedir="."> <!-- Set deployment properties filename --> <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/> <!-- Load Build Properties File --> <property file="${org.jboss.esb.deployment.properties}"/> - <property file="../version.properties" /> <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> <property name="conf.dir" value="${server.dir}/conf"/> @@ -25,34 +24,36 @@ <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/> </target> - <target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server"> - <echo message="Deploy overlord cdl runtime to JBoss ESB server" /> - <unzip src="${modules}/runtime-jbossesb-${cdl.version}/savara-runtime.esb-dist.zip" dest="${deploy.dir}" /> + <target name="deploy-savara-runtime" description="Deploys Savara Runtime to the server"> + <echo message="Deploy savara runtime to JBoss ESB server" /> + <copy todir="${deploy.dir}/savara-runtime-jbossesb.esb"> + <fileset dir="${modules}/savara-runtime-jbossesb.esb"/> + </copy> </target> - <target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime"> - <echo message="Undeploy the overlord-cdl-runtime.esb from JBoss ESB server" /> - <delete dir="${deploy.dir}/savara-runtime.esb" /> + <target name="undeploy-savara-runtime" description="Undeploys Savara Runtime"> + <echo message="Undeploy the savara runtime jbossesb from JBoss ESB server" /> + <delete dir="${deploy.dir}/savara-runtime-jbossesb.esb" /> </target> - <target name="deploy-cdl-validator" depends="check.deploy.props" description="Deploys Overlord CDL validator to the server"> - <echo message="Deploy Overlord CDL validator" /> - <ant dir="${modules}/validator-jbossesb-${cdl.version}" target="deploy"> + <target name="deploy-savara-validator" depends="check.deploy.props" description="Deploys Savara validator to the server"> + <echo message="Deploy Savara validator" /> + <ant dir="${modules}/savara-validator-jbossesb" 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> </target> - <target name="undeploy-cdl-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server"> - <echo message="Undeploy Overlord CDL validator" /> - <ant dir="${modules}/validator-jbossesb-${cdl.version}" target="undeploy"> + <target name="undeploy-savara-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server"> + <echo message="Undeploy Savara validator" /> + <ant dir="${modules}/savara-validator-jbossesb" target="undeploy"> <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> </target> - <target name="deploy" depends="deploy-cdl-runtime, deploy-cdl-validator" description="Deploy Overlord CDL components."/> + <target name="deploy" depends="deploy-savara-runtime, deploy-savara-validator" description="Deploy Savara components."/> - <target name="undeploy" depends="undeploy-cdl-runtime, undeploy-cdl-validator" description="Undeploy Overlord CDL components."/> + <target name="undeploy" depends="undeploy-savara-runtime, undeploy-savara-validator" description="Undeploy Savara components."/> </project> Modified: cdl/trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- cdl/trunk/distribution/src/main/release/install/deployment.properties 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2009-08-23 16:55:05 UTC (rev 795) @@ -7,11 +7,11 @@ # This path should not include spaces. # Use of relative paths or paths with spaces will cause runtime errors # when deploying and executing the quickstart and the trailblazers. -# (e.g. /local/deploy/jboss-4.2.3.GA) -org.jboss.esb.server.home=/local/deploy/jboss-4.2.3.GA +# (e.g. /local/deploy/jboss-5.1.0.GA) +org.jboss.esb.server.home=/local/deploy/jboss-5.1.0.GA # The Configuration of JBoss AS to Use # (e.g. default) org.jboss.esb.server.config=default # The directory for JBossESB home -# (e.g. /local/deploy/jbossesb-4.5.GA) -org.jboss.esb.home=/local/deploy/jbossesb-4.5.GA +# (e.g. /local/deploy/jbossesb-4.6.GA) +org.jboss.esb.home=/local/deploy/jbossesb-4.6.GA Deleted: cdl/trunk/distribution/src/main/release/version.properties =================================================================== --- cdl/trunk/distribution/src/main/release/version.properties 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/distribution/src/main/release/version.properties 2009-08-23 16:55:05 UTC (rev 795) @@ -1 +0,0 @@ -cdl.version=1.0-SNAPSHOT Modified: cdl/trunk/docs/docbook/gettingstartedguide/pom.xml =================================================================== --- cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/docs/docbook/gettingstartedguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -7,7 +7,7 @@ <groupId>org.jboss.savara.docs</groupId> <artifactId>gettingstartedguide</artifactId> <packaging>jdocbook</packaging> - <name>Overlord::CDL::Docs::gettingstartedguide</name> + <name>Savara::docs::gettingstartedguide</name> <parent> <groupId>org.jboss.savara</groupId> Modified: cdl/trunk/docs/docbook/samplesguide/pom.xml =================================================================== --- cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/docs/docbook/samplesguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -7,7 +7,7 @@ <groupId>org.jboss.savara.docs</groupId> <artifactId>samplesguide</artifactId> <packaging>jdocbook</packaging> - <name>Overlord::CDL::Docs::samplesguide</name> + <name>Savara::docs::samplesguide</name> <parent> <groupId>org.jboss.savara</groupId> Modified: cdl/trunk/docs/docbook/userguide/pom.xml =================================================================== --- cdl/trunk/docs/docbook/userguide/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/docs/docbook/userguide/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -7,7 +7,7 @@ <groupId>org.jboss.savara.docs</groupId> <artifactId>userguide</artifactId> <packaging>jdocbook</packaging> - <name>Overlord::CDL::Docs::userguide</name> + <name>Savara::docs::userguide</name> <parent> <groupId>org.jboss.savara</groupId> Modified: cdl/trunk/pom.xml =================================================================== --- cdl/trunk/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -144,7 +144,7 @@ <junit.version>4.4</junit.version> <rosetta.version>4.5</rosetta.version> <log4j.version>1.2.14</log4j.version> - <mvel.version>1.3.4-java1.5</mvel.version> + <mvel.version>1.3.4-java1.5</mvel.version> </properties> <dependencyManagement> Modified: cdl/trunk/samples/jbossesb/README.txt =================================================================== --- cdl/trunk/samples/jbossesb/README.txt 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/jbossesb/README.txt 2009-08-23 16:55:05 UTC (rev 795) @@ -1,7 +1,7 @@ Samples Readme ============== -This folder contains samples associated with the Overlord CDL project. +This folder contains samples associated with the Savara project. Information on the samples, and the instructions to run them, can be found in the Samples Guide within the docs folder. Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.samples</groupId> - <artifactId>jbossesb-broker</artifactId> + <artifactId>samples-broker</artifactId> <packaging>jar</packaging> <name>Savara::Samples::Broker</name> <url>http://www.jboss.org/overlord</url> Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.samples</groupId> - <artifactId>jbossesb-supplier</artifactId> + <artifactId>samples-supplier</artifactId> <packaging>jar</packaging> <name>Savara::Samples::Supplier</name> <url>http://www.jboss.org/overlord</url> Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.samples</groupId> - <artifactId>jbossesb-creditAgency</artifactId> + <artifactId>samples-creditAgency</artifactId> <packaging>jar</packaging> <name>Savara::Samples::CreditAgency</name> <url>http://www.jboss.org/overlord</url> Modified: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.samples</groupId> - <artifactId>jbossesb-purchasing</artifactId> + <artifactId>samples-store</artifactId> <packaging>jar</packaging> - <name>Savara::Samples::Purchasing</name> + <name>Savara::Samples::Store</name> <url>http://www.jboss.org/savara</url> <parent> Modified: cdl/trunk/samples/pom.xml =================================================================== --- cdl/trunk/samples/pom.xml 2009-08-21 21:09:21 UTC (rev 794) +++ cdl/trunk/samples/pom.xml 2009-08-23 16:55:05 UTC (rev 795) @@ -16,11 +16,14 @@ <modules> <module>jbossesb/common/creditAgency</module> + <module>jbossesb/brokerage/broker</module> + <module>jbossesb/brokerage/supplier</module> + <module>jbossesb/purchasing/store</module> </modules> <properties> <jaxb.version>2.1</jaxb.version> - <savara.version>1.0-SNAPSHOT</savara.version> + <savara.version>1.0-SNAPSHOT</savara.version> </properties> <dependencyManagement> @@ -32,21 +35,21 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara.runtime</groupId> - <artifactId>savara-jbossesb</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-runtime-jbossesb</artifactId> <version>${savara.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1.1</version> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1.1</version> <scope>provided</scope> </dependency> <dependency> - <groupId>sun-jaxws</groupId> - <artifactId>jsr181-api</artifactId> - <version>2.1.1</version> + <groupId>sun-jaxws</groupId> + <artifactId>jsr181-api</artifactId> + <version>2.1.1</version> <scope>provided</scope> </dependency> <dependency>