[overlord-commits] Overlord SVN: r351 - in cdl/trunk: distribution and 12 other directories.

Author: jeff.yuchang Date: 2008-09-28 13:38:27 -0400 (Sun, 28 Sep 2008) New Revision: 351 Added: cdl/trunk/distribution/src/main/release/version.properties 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/docs/docbook/userguide/pom.xml cdl/trunk/docs/docbook/userguide/src/main/module/getting_started.xml cdl/trunk/pom.xml cdl/trunk/runtime/jbossesb-assembly/pom.xml cdl/trunk/runtime/jbossesb/pom.xml 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: * Complete the getting_started document to docbook version. * Add version.properties, so that in the install/build.xml doesn't need to be hard coded version number. * Add docbook generated documents into the distribution. * update the runtime module name from 'jbossesb' to 'cdl-jbossesb', so that the mvn eclipse:eclipse will produce the 'cdl-jbossesb' as default project name. Modified: cdl/trunk/distribution/pom.xml =================================================================== --- cdl/trunk/distribution/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/distribution/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -34,12 +34,12 @@ <dependencies> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> + <artifactId>cdl-jbossesb</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb-assembly</artifactId> + <artifactId>cdl-jbossesb-assembly</artifactId> <version>${pom.version}</version> <type>esb</type> </dependency> Modified: cdl/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -38,12 +38,18 @@ <outputDirectory>modules/validator-jbossesb-${cdl.version}</outputDirectory> </fileSet> + <fileSet> + <directory>../runtime/jbossesb-assembly/target/overlord-cdl-runtime-jbossesb</directory> + <outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory> + </fileSet> + <!--Copy files like License and samples etc --> <fileSet> <directory>src/main/release</directory> <outputDirectory>/</outputDirectory> <includes> <include>*.txt</include> + <include>*.properties</include> </includes> </fileSet> @@ -60,6 +66,13 @@ </includes> </fileSet> + <!-- Copy docbook generated documents --> + <fileSet> + <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory> + <outputDirectory>docs/userguide</outputDirectory> + </fileSet> + + <!-- Copy samples --> <fileSet> <directory>src/main/release/samples/jbossesb</directory> <outputDirectory>samples</outputDirectory> @@ -88,7 +101,7 @@ <dependencySet> <outputDirectory>samples/libs</outputDirectory> <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> + <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>org.jboss.jbossesb:config-model</include> <include>log4j:log4j</include> @@ -106,45 +119,39 @@ <outputDirectory>samples/brokerage/broker/lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> + <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>log4j:log4j</include> </includes> </dependencySet> <dependencySet> <outputDirectory>samples/brokerage/supplier/lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> + <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>log4j:log4j</include> </includes> </dependencySet> <dependencySet> <outputDirectory>samples/purchasing/store/lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> + <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>log4j:log4j</include> </includes> </dependencySet> <dependencySet> <outputDirectory>samples/common/creditAgency/lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> + <include>org.jboss.soa.overlord.cdl.runtime:cdl-jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>log4j:log4j</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>modules</outputDirectory> - <includes> - <include>org.jboss.soa.overlord.cdl.runtime:jbossesb-assembly</include> - </includes> - </dependencySet> </dependencySets> </assembly> Modified: cdl/trunk/distribution/src/main/release/install/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -5,6 +5,7 @@ <!-- 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,18 +26,20 @@ </target> <target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server"> - <echo message="unpack overlord cdl runtime to JBoss ESB server" /> - <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime.esb" /> + <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> </target> <target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime"> - <echo message="Remove the overlord-cdl-runtime.esb from JBoss ESB server" /> + <echo message="Undeploy the overlord-cdl-runtime.esb from JBoss ESB server" /> <delete dir="${deploy.dir}/overlord-cdl-runtime.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-1.0-SNAPSHOT" target="deploy"> + <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> @@ -44,7 +47,7 @@ <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-1.0-SNAPSHOT" target="undeploy"> + <ant dir="${modules}/validator-jbossesb-${cdl.version}" 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> Added: cdl/trunk/distribution/src/main/release/version.properties =================================================================== --- cdl/trunk/distribution/src/main/release/version.properties (rev 0) +++ cdl/trunk/distribution/src/main/release/version.properties 2008-09-28 17:38:27 UTC (rev 351) @@ -0,0 +1 @@ +cdl.version=1.0-SNAPSHOT Modified: cdl/trunk/docs/docbook/userguide/pom.xml =================================================================== --- cdl/trunk/docs/docbook/userguide/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/docs/docbook/userguide/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -62,6 +62,11 @@ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> <finalName>UserGuide.pdf</finalName> </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> <format> <formatName>html_single</formatName> <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> Modified: cdl/trunk/docs/docbook/userguide/src/main/module/getting_started.xml =================================================================== --- cdl/trunk/docs/docbook/userguide/src/main/module/getting_started.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/docs/docbook/userguide/src/main/module/getting_started.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -173,7 +173,7 @@ <orderedlist> <listitem>JBossAS (version 4.2.3.GA or higher), available from http://www.jboss.org/jbossas</listitem> <listitem>JBossESB (version 4.4.GA or higher), available from http://www.jboss.org/jbossesb</listitem> - <listitem>Overlord CDL (version 1.0.SNAPSHOT or higher) </listitem> + <listitem>Overlord CDL (version 1.0-SNAPSHOT or higher) </listitem> <listitem> pi4soa (version 2.0.0 or higher), available from http://www.pi4soa.org <note> @@ -202,6 +202,55 @@ Then follow the instructions in the JBossESB installation (install/readme.txt), to deploy JBossESB into the JBossAS environment. </para> </listitem> + + <listitem> + Install the Overlord CDL distribution + <para> + Unpack the Overlord CDL distribution into a location alongside the JBossAS installation. + </para> + <para> + <itemizedlist> + <listitem> + Edit the <emphasis role="bold">install/deployment.properties</emphasis> file to update the JBossAS and JBossESB location settings. + </listitem> + <listitem> + From the install folder, run: <command> ant deploy</command>to deploy both the Overlord CDL conversational ESB actions and service validation capabilities. + Or <command>ant deploy-overlord-cdl-runtime</command> to deploy just the conversational ESB actions support, or <command>ant deploy-overlord-cdl-validator</command> to deploy just the service validation capability. + </listitem> + </itemizedlist> + </para> + </listitem> + + <listitem> + Install pi4soa + <para> + Unpack the pi4soa pre-packaged Eclipse version into a location alongside the JBossAS installation, or install the relevant plugins (as described on the pi4soa wiki) into an existing Eclipse environment. + </para> + <para> + If just the service validation capabilities are being used, then no further configuration of the Eclipse environment is necessary. + However if the conversational ESB actions, with conformance checking against a Choreography Description, will be used, then the following additional steps will be required: + </para> + <para> + <itemizedlist> + <listitem> + Start the Eclipse environment + </listitem> + <listitem> + Select the “Help - &gt; Software Updates...” menu item + </listitem> + <listitem> + From the <emphasis role="bold"> Available Software</emphasis> tab, press the “Add Site...” button + </listitem> + <listitem> + Press the “Local” button, browse to locate the <emphasis role="bold">tools</emphasis> folder in the Overlord CDL distribution, + and then press the OK button. This will cause the local Eclipse update site, bundled with the Overlord CDL distribution, to be add to the <emphasis role="bold"> Available Software </emphasis> tab. + </listitem> + <listitem> + Select the root node of the newly added local update site, and then press the “Install” button and follow the instructions to install the plugins. + </listitem> + </itemizedlist> + </para> + </listitem> </orderedlist> </section> Modified: cdl/trunk/pom.xml =================================================================== --- cdl/trunk/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -38,6 +38,7 @@ </developers> <modules> <module>runtime</module> + <module>docs/docbook</module> <module>distribution</module> </modules> Modified: cdl/trunk/runtime/jbossesb/pom.xml =================================================================== --- cdl/trunk/runtime/jbossesb/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/runtime/jbossesb/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -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.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> + <artifactId>cdl-jbossesb</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Overlord::CDL::Runtime::JBossESB</name> Modified: cdl/trunk/runtime/jbossesb-assembly/pom.xml =================================================================== --- cdl/trunk/runtime/jbossesb-assembly/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/runtime/jbossesb-assembly/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -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.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb-assembly</artifactId> + <artifactId>cdl-jbossesb-assembly</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jboss-esb</packaging> <name>Overlord::CDL::Runtime::JBossESB-Assembly</name> @@ -24,7 +24,7 @@ <dependencies> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> + <artifactId>cdl-jbossesb</artifactId> <version>1.0-SNAPSHOT</version> </dependency> @@ -87,7 +87,7 @@ </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jboss-packaging-maven-plugin</artifactId> <version>2.0-20080130.110241-9</version> Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -24,8 +24,8 @@ </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>cdl-jbossesb</artifactId> + <version>${cdl.jbossesb.version}</version> <scope>provided</scope> </dependency> </dependencies> Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -24,8 +24,8 @@ </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>cdl-jbossesb</artifactId> + <version>${cdl.jbossesb.version}</version> <scope>provided</scope> </dependency> Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -24,8 +24,8 @@ </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>cdl-jbossesb</artifactId> + <version>${cdl.jbossesb.version}</version> <scope>provided</scope> </dependency> Modified: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -24,8 +24,8 @@ </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl.runtime</groupId> - <artifactId>jbossesb</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>cdl-jbossesb</artifactId> + <version>${cdl.jbossesb.version}</version> <scope>provided</scope> </dependency> </dependencies> Modified: cdl/trunk/samples/pom.xml =================================================================== --- cdl/trunk/samples/pom.xml 2008-09-28 15:15:10 UTC (rev 350) +++ cdl/trunk/samples/pom.xml 2008-09-28 17:38:27 UTC (rev 351) @@ -17,6 +17,7 @@ <properties> <deploy.dir>/var/local/jboss/server/default/deploy</deploy.dir> + <cdl.jbossesb.version>1.0-SNAPSHOT</cdl.jbossesb.version> </properties>