7:58 a.m.
Author: jeff.yuchang
Date: 2009-08-20 01:58:57 -0400 (Thu, 20 Aug 2009)
New Revision: 775
Added:
cdl/trunk/validator/jbossesb/src/main/configs/
cdl/trunk/validator/jbossesb/src/main/configs/META-INF/
cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml
cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml
cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml
cdl/trunk/validator/jbossesb/src/main/configs/models/
cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm
cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml
Removed:
cdl/trunk/Developer.txt
cdl/trunk/install.xml
cdl/trunk/runtime/pom.xml
cdl/trunk/validator/jbossesb-assembly/
cdl/trunk/validator/pom.xml
Modified:
cdl/trunk/pom.xml
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml
cdl/trunk/validator/jbossesb/pom.xml
Log:
* Update the validator module (removing the esb maven plugin)
Deleted: cdl/trunk/Developer.txt
===================================================================
--- cdl/trunk/Developer.txt 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/Developer.txt 2009-08-20 05:58:57 UTC (rev 775)
@@ -1,16 +0,0 @@
-
-Building from source
----------------------------
-0. Checked you have installed the Maven 2.0.9 or above.
- Otherwise, you can download it from http://maven.apache.org
-1. Download the JBossESB 4.5 from http://www.jboss.org/jbossesb/downloads/
-2. Run the following command to install the required libraries into local maven
repository.
- ant -f install.xml
-
-
-Setting up in IDE
----------------------------
-1. Setup in Eclipse
- run the following command to generate the eclipse specific environment:
- mvn eclipse:eclipse
-
Deleted: cdl/trunk/install.xml
===================================================================
--- cdl/trunk/install.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/install.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -1,40 +0,0 @@
-<project name="Overlord-CDL" basedir="."
default="install" >
-
- <property name="libraries.dir"
value="${basedir}/distribution/libraries" />
- <property name="shell" value="/bin/sh" />
-
- <target name="init">
- <condition property="shell" value="cmd.exe">
- <os family="Windows"/>
- </condition>
-
- <condition property="shell" value="bin/sh">
- <os family="UNIX"/>
- </condition>
- </target>
-
- <target name="install" depends="init">
- <echo message="Install the libraries into the local maven repo"
/>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file
-DgroupId=org.jboss.jbossesb -DartifactId=rosetta -Dversion=4.5 -Dpackaging=jar
-Dfile=${libraries.dir}/rosetta-4.5.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb
-DartifactId=config-model -Dversion=1.0.1 -Dpackaging=jar
-Dfile=${libraries.dir}/config-model-1.0.1.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa
-DartifactId=common -Dversion=2.0 -Dpackaging=jar
-Dfile=${libraries.dir}/pi4soa-common-2.0.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa
-DartifactId=cdl -Dversion=2.0 -Dpackaging=jar
-Dfile=${libraries.dir}/pi4soa-cdl-2.0.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa
-DartifactId=service -Dversion=2.0 -Dpackaging=jar
-Dfile=${libraries.dir}/pi4soa-service-2.0.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.eclipse.emf
-DartifactId=common -Dversion=2.3.0 -Dpackaging=jar
-Dfile=${libraries.dir}/eclipse-emf-common-2.3.0.jar'" />
- </exec>
- <exec executable="${shell}">
- <arg line="-c 'mvn install:install-file -DgroupId=org.eclipse.emf
-DartifactId=ecore -Dversion=2.3.1 -Dpackaging=jar
-Dfile=${libraries.dir}/eclipse-emf-ecore-2.3.1.jar'" />
- </exec>
- </target>
-</project>
Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/pom.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -1,208 +1,236 @@
-<project 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss</groupId>
- <artifactId>savara</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Savara</name>
- <url>http://www.jboss.org/overlord/savara</url>
- <description>
- JBoss Savara.
- </description>
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/soag/savara/trunk</c...
- </scm>
- <developers>
- <developer>
- <name>Jeff Yu</name>
- <id>jeff.yuchang</id>
- <email>cyu(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+8</timezone>
- </developer>
- <developer>
- <name>Gary Brown</name>
- <id>objectiser</id>
- <email>gbrown(a)redhat.com</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
- <modules>
- <module>runtime</module>
- <module>validator</module>
- <module>samples</module>
- </modules>
-
- <properties>
- <savara-version>1.0-SNAPSHOT</savara-version>
- <junit.version>4.4</junit.version>
- <rosetta.version>4.5</rosetta.version>
- <log4j.version>1.2.14</log4j.version>
- </properties>
-
- <profiles>
- <profile>
- <id>release</id>
- <modules>
- <module>docs/docbook</module>
- <module>distribution</module>
- </modules>
- </profile>
- <profile>
- <!--
- This profile is activated when the "generate.docs" property is set,
- as in "mvn ... -Dgenerate.docs=true ..."
- -->
- <id>docs</id>
- <activation>
- <property>
- <name>generate.docs</name>
- </property>
- </activation>
- <modules>
- <module>docs</module>
- </modules>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <show>public</show>
- <title>JBoss Savara ${project.version}</title>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
-
- <build>
- <!-- This section defines the default plugin settings inherited by child projects.
-->
- <pluginManagement>
- <plugins>
- <!-- Fixes how test resources of a project can be used in projects dependent on it
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <!-- Specify the compiler options and settings -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
- <!-- Produce source jars during the 'verify' phase -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <url>http://repository.jboss.com/maven2/</url>
- </repository>
-
- <repository>
- <id>jboss-snapshot</id>
- <url>http://snapshots.jboss.org/maven2</url>
- </repository>
-
- <repository>
- <id>maven.repo</id>
- <name>maven repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
-
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
- </repository>
-
- <repository>
- <id>codehaus</id>
- <name>codehaus repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
-
- <!-- Not all dependencies are resolved when using this repository.
- Complains about not finding appropriate version of
- org.eclipse.equinox.app plugin. -->
- <!-- repository>
- <id>eclipse</id>
- <name>eclipse repository</name>
- <url>http://repo1.maven.org/eclipse</url>
- </repository-->
-
- </repositories>
-
- <distributionManagement>
- <repository>
- <!-- Copy the distribution jar file to a local checkout of the maven repository
- - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
- <id>repository.jboss.org</id>
- <url>file://${jboss.repository.root}</url>
- </repository>
- </distributionManagement>
-
-</project>
-
+<project 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss</groupId>
+ <artifactId>savara</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Savara</name>
+ <url>http://www.jboss.org/overlord/savara</url>
+ <description>
+ JBoss Savara.
+ </description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/soag/savara/trunk</c...
+ </scm>
+ <developers>
+ <developer>
+ <name>Jeff Yu</name>
+ <id>jeff.yuchang</id>
+ <email>cyu(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+8</timezone>
+ </developer>
+ <developer>
+ <name>Gary Brown</name>
+ <id>objectiser</id>
+ <email>gbrown(a)redhat.com</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <modules>
+ <module>runtime/jbossesb</module>
+ <module>validator/jbossesb</module>
+ <module>samples</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>docs/docbook</module>
+ <module>distribution</module>
+ </modules>
+ </profile>
+ <profile>
+ <!--
+ This profile is activated when the "generate.docs" property is set,
+ as in "mvn ... -Dgenerate.docs=true ..."
+ -->
+ <id>docs</id>
+ <activation>
+ <property>
+ <name>generate.docs</name>
+ </property>
+ </activation>
+ <modules>
+ <module>docs</module>
+ </modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <show>public</show>
+ <title>JBoss Savara ${project.version}</title>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+
+ <build>
+ <!-- This section defines the default plugin settings inherited by child projects.
-->
+ <pluginManagement>
+ <plugins>
+ <!-- Fixes how test resources of a project can be used in projects dependent on it
-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- Specify the compiler options and settings -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+ <!-- Produce source jars during the 'verify' phase -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <savara-version>1.0-SNAPSHOT</savara-version>
+ <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>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId>
+ <artifactId>jbossesb-rosetta</artifactId>
+ <version>${rosetta.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>${mvel.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
+
+ <repository>
+ <id>jboss-snapshot</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
+
+ <repository>
+ <id>maven.repo</id>
+ <name>maven repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+ </repository>
+
+ <repository>
+ <id>codehaus</id>
+ <name>codehaus repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+
+ <!-- Not all dependencies are resolved when using this repository.
+ Complains about not finding appropriate version of
+ org.eclipse.equinox.app plugin. -->
+ <!-- repository>
+ <id>eclipse</id>
+ <name>eclipse repository</name>
+ <url>http://repo1.maven.org/eclipse</url>
+ </repository-->
+
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${jboss.repository.root}</url>
+ </repository>
+ </distributionManagement>
+
+</project>
+
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -2,15 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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.runtime</groupId>
- <artifactId>savara-jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-runtime-jbossesb</artifactId>
<packaging>jar</packaging>
<name>Savara::Runtime::JBoss ESB</name>
<parent>
- <groupId>org.jboss.savara</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>savara</artifactId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<properties>
@@ -20,22 +21,18 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
- <version>${rosetta.version}</version>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel</artifactId>
- <version>1.3.4-java1.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -52,7 +49,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>savara-runtime.esb</finalName>
+ <finalName>savara-runtime-jbossesb.esb</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/configs/esb-assembly.xml</descriptor>
Modified: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-19 12:07:42 UTC
(rev 774)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-20 05:58:57 UTC
(rev 775)
@@ -20,7 +20,7 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org.jboss.savara.runtime:savara-jbossesb</include>
+ <include>org.jboss.savara:savara-runtime-jbossesb</include>
</includes>
</dependencySet>
</dependencySets>
Deleted: cdl/trunk/runtime/pom.xml
===================================================================
--- cdl/trunk/runtime/pom.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/runtime/pom.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -1,21 +0,0 @@
-<project 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.savara</groupId>
- <artifactId>runtime</artifactId>
- <packaging>pom</packaging>
- <name>Savara::Runtime</name>
-
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>savara</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <modules>
- <module>jbossesb</module>
- </modules>
-
-</project>
-
Modified:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
===================================================================
---
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-19
12:07:42 UTC (rev 774)
+++
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-20
05:58:57 UTC (rev 775)
@@ -61,7 +61,7 @@
*/
public static void main(String[] args) throws Throwable{
WSBuyerClient client = new WSBuyerClient();
- String msg = getMessage("02");
+ String msg = getMessage("01");
System.out.println(msg);
client.sendMessageToJBRListener("http", 8765, msg);
}
Modified: cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml 2009-08-19 12:07:42 UTC (rev
774)
+++ cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml 2009-08-20 05:58:57 UTC (rev
775)
@@ -4,7 +4,7 @@
<wsdl:checkCredit>
<CreditCheckRequest id="1"
xmlns:ns2="http://www.jboss.org/overlord/examples/xsd">
<ns2:account>243</ns2:account>
- <ns2:amount>500</ns2:amount>
+ <ns2:amount>502</ns2:amount>
</CreditCheckRequest>
</wsdl:checkCredit>
</soapenv:Body>
Modified: cdl/trunk/validator/jbossesb/pom.xml
===================================================================
--- cdl/trunk/validator/jbossesb/pom.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/validator/jbossesb/pom.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -2,15 +2,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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.validator</groupId>
- <artifactId>cdl-validator-jbossesb</artifactId>
+ <groupId>org.jboss.savara</groupId>
+ <artifactId>savara-validator-jbossesb</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Overlord::CDL::Validator::JBossESB</name>
+ <name>Savara::Validator::JBossESB</name>
<parent>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>validator</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>savara</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
@@ -18,19 +18,16 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
- <version>${rosetta.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -67,7 +64,26 @@
<build>
<plugins>
- <plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>savara-validator-jbossesb.esb</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/configs/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -103,7 +119,7 @@
<encoding>UTF-8</encoding>
<locale>en_US</locale>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml
(rev 0)
+++ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml 2009-08-20
05:58:57 UTC (rev 775)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+ <depends>jboss.esb:deployment=jbossesb.esb</depends>
+ <depends>pi4soa:service=pi4soa</depends>
+</jbossesb-deployment>
Added: cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml
(rev 0)
+++ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml 2009-08-20
05:58:57 UTC (rev 775)
@@ -0,0 +1,6 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb
xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc...
parameterReloadSecs="5">
+ <!--
+ jbossesb internal services
+ -->
+</jbossesb>
Added: cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml
(rev 0)
+++ cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml 2009-08-20 05:58:57 UTC
(rev 775)
@@ -0,0 +1,27 @@
+<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>dist</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/configs</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>esb-assembly.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.jboss.savara:savara-validator-jbossesb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm
(rev 0)
+++ cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm 2009-08-20
05:58:57 UTC (rev 775)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.pi4soa.cdl:Package xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The
choreography description for TrailBlazer" name="TrailBlazer"
author="gary" version="0.1"
targetNamespace="http://www.pi4soa.org/TrailBlazer">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for TrailBlazer"
prefix="tns" uRI="http://www.pi4soa.org/TrailBlazer"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd"
uRI="http://www.w3.org/2001/XMLSchema"/>
+ <informationTypes description="This is the information type
CreditCheckReq" name="CreditCheckReq"
elementName="creditCheck"/>
+ <informationTypes description="This is the information type
CreditCheckResp" name="CreditCheckResp"
elementName="creditCheckResult"/>
+ <informationTypes description="This is the information type
InsufficientCredit" name="InsufficientCredit"
elementName="insufficientCredit"/>
+ <informationTypes description="This is the information type Quote"
name="Quote" elementName="quote"/>
+ <informationTypes description="This is the information type
QuoteRefType" name="QuoteRefType" typeName="xsd:string"/>
+ <informationTypes description="This is the information type QuoteReq"
name="QuoteReq" elementName="quoteRequest"/>
+ <informationTypes description="This is the information type SSNType"
name="SSNType" typeName="xsd:string"/>
+ <informationTypes description="This is the information type URIType"
name="URIType" typeName="xsd:anyURI"/>
+ <tokens description="This is the token QuoteRef"
name="QuoteRef"
informationType="//@typeDefinitions/(a)informationTypes.4"/>
+ <tokens description="This is the token SSN" name="SSN"
informationType="//@typeDefinitions/(a)informationTypes.6"/>
+ <tokens description="This is the token URI" name="URI"
informationType="//@typeDefinitions/(a)informationTypes.7"/>
+ <tokenLocators description="This is the token locator
QuoteRef4InsufficientCredit" token="//@typeDefinitions/(a)tokens.0"
informationType="//@typeDefinitions/(a)informationTypes.2"
query="//ref/text()" name="QuoteRef4InsufficientCredit"/>
+ <tokenLocators description="This is the token locator QuoteRef4Quote"
token="//@typeDefinitions/(a)tokens.0"
informationType="//@typeDefinitions/(a)informationTypes.3"
query="//ref/text()" name="QuoteRef4Quote"/>
+ <tokenLocators description="This is the token locator QuoteRef4QuoteReq"
token="//@typeDefinitions/(a)tokens.0"
informationType="//@typeDefinitions/(a)informationTypes.5"
query="//@ref" name="QuoteRef4QuoteReq"/>
+ <tokenLocators description="This is the token locator
SSN4CreditCheckReq" token="//@typeDefinitions/(a)tokens.1"
informationType="//@typeDefinitions/(a)informationTypes.0"
query="//@ssn" name="SSN4CreditCheckReq"/>
+ <tokenLocators description="This is the token locator
SSN4CreditCheckResp" token="//@typeDefinitions/(a)tokens.1"
informationType="//@typeDefinitions/(a)informationTypes.1"
query="//@ssn" name="SSN4CreditCheckResp"/>
+ <tokenLocators description="This is the token locator
SSN4InsufficientCredit" token="//@typeDefinitions/(a)tokens.1"
informationType="//@typeDefinitions/(a)informationTypes.2"
query="//customerUID/text()" name="SSN4InsufficientCredit"/>
+ <tokenLocators description="This is the token locator SSN4Quote"
token="//@typeDefinitions/(a)tokens.1"
informationType="//@typeDefinitions/(a)informationTypes.3"
query="//customerUID/text()" name="SSN4Quote"/>
+ <tokenLocators description="This is the token locator SSN4QuoteReq"
token="//@typeDefinitions/(a)tokens.1"
informationType="//@typeDefinitions/(a)informationTypes.5"
query="//@ssn" name="SSN4QuoteReq"/>
+ <roleTypes description="This is the role type Bank"
name="Bank">
+ <behaviors description="This is the behavior BankBehavior"
name="BankBehavior" interface="bank"/>
+ </roleTypes>
+ <roleTypes description="This is the role type CreditAgency"
name="CreditAgency">
+ <behaviors description="This is the behavior CreditAgencyBehavior"
name="CreditAgencyBehavior" interface="creditAgency"/>
+ </roleTypes>
+ <roleTypes description="This is the role type LoanBroker"
name="LoanBroker">
+ <behaviors description="This is the behavior LoanBrokerBehavior"
name="LoanBrokerBehavior" interface="loanBroker"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Notifier"
name="Notifier">
+ <behaviors description="This is the behavior NotifierBehavior"
name="NotifierBehavior" interface="notifier"/>
+ </roleTypes>
+ <relationshipTypes description="Relationship between LoanBroker and
Bank" name="LoanBrokerToBankRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.2"
secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <relationshipTypes description="Relationship between LoanBroker and
CreditAgency" name="LoanBrokerToCreditAgencyRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.2"
secondRoleType="//@typeDefinitions/(a)roleTypes.1"/>
+ <relationshipTypes description="Relationship between LoanBroker and
Notifier" name="LoanBrokerToNotifierRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.2"
secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
+ <participantTypes description="This is the participant type
BankParticipant" name="BankParticipant"
roleTypes="//@typeDefinitions/(a)roleTypes.0"/>
+ <participantTypes description="This is the participant type
CreditAgencyParticipant" name="CreditAgencyParticipant"
roleTypes="//@typeDefinitions/(a)roleTypes.1"/>
+ <participantTypes description="This is the participant type
LoanBrokerParticipant" name="LoanBrokerParticipant"
roleTypes="//@typeDefinitions/(a)roleTypes.2"/>
+ <participantTypes description="This is the participant type
NotifierParticipant" name="NotifierParticipant"
roleTypes="//@typeDefinitions/(a)roleTypes.3"/>
+ <channelTypes description="This is the channel type BankChannelType"
name="BankChannelType" referenceToken="//@typeDefinitions/(a)tokens.2"
roleType="//@typeDefinitions/(a)roleTypes.0">
+ <identities description="SSN Id and Quote Ref"
tokens="//@typeDefinitions/(a)tokens.1 //@typeDefinitions/(a)tokens.0"/>
+ <identities description="SSN Id" type="Association"
tokens="//@typeDefinitions/(a)tokens.1"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type
CreditAgencyChannelType" name="CreditAgencyChannelType"
referenceToken="//@typeDefinitions/(a)tokens.2"
roleType="//@typeDefinitions/(a)roleTypes.1">
+ <identities description="SSN Id"
tokens="//@typeDefinitions/(a)tokens.1"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type NotifierChannelType"
name="NotifierChannelType"
referenceToken="//@typeDefinitions/(a)tokens.2"
roleType="//@typeDefinitions/(a)roleTypes.3">
+ <identities description="SSN Id" type="Association"
tokens="//@typeDefinitions/(a)tokens.1"/>
+ <identities description="SSN Id and Quote Ref"
tokens="//@typeDefinitions/(a)tokens.1 //@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ </typeDefinitions>
+ <choreographies description="Choreography flow for the TrailBlazer
process" name="TrailBlazerProcess" root="true">
+ <enclosedChoreographies name="RequestQuote">
+ <variableDefinitions description="Channel to facilitate interaction to
Bank" name="BankChannel"
type="//@typeDefinitions/(a)channelTypes.0"
roleTypes="//@typeDefinitions/(a)roleTypes.0
//@typeDefinitions/(a)roleTypes.2"/>
+ <variableDefinitions description="Channel to facilitate interaction to
Notifier" name="NotifierChannel"
type="//@typeDefinitions/(a)channelTypes.2"
roleTypes="//@typeDefinitions/(a)roleTypes.2
//@typeDefinitions/(a)roleTypes.3"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="QuoteRequest" operation="requestQuote"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction QuoteRequest"
name="QuoteRequestRequestExchange"
type="//@typeDefinitions/(a)informationTypes.5">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-jmsBankRequestQueue}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-fileBankRequestQueue}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction QuoteRequest"
name="QuoteRequestRespondExchange"
type="//@typeDefinitions/(a)informationTypes.3" action="Respond">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-jmsBankResponseQueue}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-fileBankResponseQueue}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="NotifyCustomer" operation="notify"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction NotifyCustomer"
name="NotifyCustomerRequestExchange"
type="//@typeDefinitions/(a)informationTypes.3">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-customerNotifier}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ </activities>
+ </enclosedChoreographies>
+ <variableDefinitions description="Channel to facilitate interaction to
CreditAgency" name="CreditAgencyChannel"
type="//@typeDefinitions/(a)channelTypes.1"
roleTypes="//@typeDefinitions/(a)roleTypes.1
//@typeDefinitions/(a)roleTypes.2"/>
+ <variableDefinitions description="This is the variable NotifierChannel"
name="NotifierChannel" type="//@typeDefinitions/(a)channelTypes.2"
roleTypes="//@typeDefinitions/(a)roleTypes.2
//@typeDefinitions/(a)roleTypes.3"/>
+ <variableDefinitions description="This is the variable
creditCheckResult" name="creditCheckResult"
type="//@typeDefinitions/(a)informationTypes.1"
roleTypes="//@typeDefinitions/(a)roleTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="CreditCheck" operation="checkCredit"
channelVariable="//@choreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request
exchange associated with interaction CreditCheck"
name="CreditCheckRequestExchange"
type="//@typeDefinitions/(a)informationTypes.0">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-creditAgencyQueue}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="CreditCheck" operation="checkCredit"
channelVariable="//@choreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the respond
exchange associated with interaction CreditCheck"
name="CreditCheckRespondExchange"
type="//@typeDefinitions/(a)informationTypes.1" action="Respond"
receiveVariable="//@choreographies.0/(a)variableDefinitions.2">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-creditAgencyQueue_reply}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice">
+ <activities xsi:type="org.pi4soa.cdl:Conditional"
description="Sufficient credit to request quotes" name="ValidCredit"
expression="cdl:getVariable('creditCheckResult','','//@score')
>= 4">
+ <activities xsi:type="org.pi4soa.cdl:Parallel">
+ <activities xsi:type="org.pi4soa.cdl:Sequence"
description="First quote">
+ <activities xsi:type="org.pi4soa.cdl:Perform"
choreography="//@choreographies.0/(a)enclosedChoreographies.0"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence"
description="Second quote">
+ <activities xsi:type="org.pi4soa.cdl:Perform"
choreography="//@choreographies.0/(a)enclosedChoreographies.0"/>
+ </activities>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence"
description="Insufficient credit">
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="NotifyCustomer" operation="notify"
channelVariable="//@choreographies.0/(a)variableDefinitions.1"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction NotifyCustomer"
name="NotifyCustomerRequestExchange"
type="//@typeDefinitions/(a)informationTypes.2">
+ <semanticAnnotations
annotation="<jbossesb>
	<destination
name="{{Destination;The URI for the ESB
destination;string;;jms:queue/esb-tb-customerNotifier}}"
		dynamicReplyTo="{{Dynamic
ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}"
/>
</jbossesb>
"
name="jbossesb"/>
+ </exchangeDetails>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Added: cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml
(rev 0)
+++ cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml 2009-08-20 05:58:57
UTC (rev 775)
@@ -0,0 +1,2 @@
+<validator mode="monitor" replyToTimeout="10000" >
+</validator>
Deleted: cdl/trunk/validator/pom.xml
===================================================================
--- cdl/trunk/validator/pom.xml 2009-08-19 12:07:42 UTC (rev 774)
+++ cdl/trunk/validator/pom.xml 2009-08-20 05:58:57 UTC (rev 775)
@@ -1,23 +0,0 @@
-<project 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>validator</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Overlord::CDL::Validator</name>
-
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>savara</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <modules>
- <module>jbossesb</module>
- <module>jbossesb-assembly</module>
- </modules>
-
-</project>
-