[overlord-commits] Overlord SVN: r39 - in trunk: distribution and 6 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Fri Jun 20 07:26:10 EDT 2008


Author: jeff.yuchang
Date: 2008-06-20 07:26:10 -0400 (Fri, 20 Jun 2008)
New Revision: 39

Added:
   trunk/distribution/
   trunk/distribution/install/
   trunk/distribution/lib/
   trunk/samples/esb/purchasing/system/pom.xml
   trunk/samples/esb/purchasing/system/src/main/resources/META-INF/
   trunk/samples/esb/purchasing/system/src/main/resources/META-INF/deployment.xml
   trunk/samples/esb/purchasing/system/src/main/resources/META-INF/jboss-esb.xml
   trunk/samples/pom.xml
Removed:
   trunk/install/
   trunk/lib/
   trunk/samples/esb/purchasing/system/.classpath
   trunk/samples/esb/purchasing/system/src/main/resources/deployment.xml
   trunk/samples/esb/purchasing/system/src/main/resources/jbm-queue-service.xml
   trunk/samples/esb/purchasing/system/src/main/resources/jboss-esb.xml
   trunk/samples/esb/purchasing/system/src/main/resources/jbossesb-properties.xml
Modified:
   trunk/pom.xml
   trunk/runtime/jbossesb/pom.xml
   trunk/runtime/pom.xml
   trunk/samples/esb/purchasing/system/build.xml
   trunk/samples/esb/purchasing/system/src/main/resources/hibernate.cfg.xml
   trunk/samples/esb/purchasing/system/src/main/resources/log4j.xml
Log:
[SOAG-13]
* Update the maven pom file
* restrcture the install& lib folder.


Copied: trunk/distribution/install (from rev 36, trunk/install)

Copied: trunk/distribution/lib (from rev 36, trunk/lib)

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/pom.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -33,11 +33,6 @@
 
 	<properties>
 		<overlord-version>1.0-SNAPSHOT</overlord-version>
-        <hibernate-version>3.2.4.sp1</hibernate-version>
-        <hibernate-annotation-version>3.2.1.GA</hibernate-annotation-version>
-        <ejb3-persistence-version>1.0.1.GA</ejb3-persistence-version>
-        <hibernate-commons-annotation>3.0.0.GA</hibernate-commons-annotation>
-		<hibernate-tools>3.2.0.GA</hibernate-tools>
 	</properties>
 	
 	<profiles>
@@ -133,10 +128,6 @@
 						<include>**/*TestCase.java</include>
 						<include>**/*Test.java</include>
 					</includes>
-					<!--excludes>
-						<exclude>**/Abstract*TestCase.java</exclude>
-						<exclude>**/Abstract*Test.java</exclude>
-					</excludes-->
 				</configuration>
 			</plugin>
 			<!-- 
@@ -173,14 +164,6 @@
 			</plugin>
 		</plugins>
 	</build>
-	<!--
-	This section defines the default dependency settings inherited by child projects.
-	Note that this section does not add dependencies, but rather provide default settings.
-	-->
-	<dependencyManagement>
-		<dependencies>
-		</dependencies>
-	</dependencyManagement>
 
 	<reporting>
 		<plugins>
@@ -202,19 +185,20 @@
 			<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>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>ibiblio</id>
+	        <name>ibiblio repository</name>
+	        <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+	    </repository>
 
 	</repositories>
+
 	<distributionManagement>
 		<repository>
 			<!-- Copy the distribution jar file to a local checkout of the maven repository 
@@ -223,5 +207,6 @@
 			<url>file://${jboss.repository.root}</url>
 		</repository>
 	</distributionManagement>
+	
 </project>
 

Modified: trunk/runtime/jbossesb/pom.xml
===================================================================
--- trunk/runtime/jbossesb/pom.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/runtime/jbossesb/pom.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -6,7 +6,7 @@
 	<artifactId>runtime-jbossesb</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>JBoss Overlord - Runtime - JBossESB</name>
+	<name>Overlord::Runtime::JBossESB</name>
 	<url>http://www.jboss.org/overlord</url>
 	
 	<parent>
@@ -19,8 +19,6 @@
         <hibernate-version>3.2.4.sp1</hibernate-version>
         <hibernate-annotations-version>3.2.1.ga</hibernate-annotations-version>
         <ejb3-persistence-version>1.0.1.GA</ejb3-persistence-version>
-        <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations>
-		<hibernate-tools-version>3.2.0.ga</hibernate-tools-version>
 	</properties>
 	
 		<dependencies>	
@@ -55,15 +53,10 @@
 				<version>${ejb3-persistence-version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-commons-annotations</artifactId>
-				<version>${hibernate-commons-annotations}</version>
+			    <groupId>c3p0</groupId>
+				<artifactId>c3p0</artifactId>
+				<version>0.9.1</version>
 			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-tools</artifactId>
-				<version>${hibernate-tools-version}</version>
-			</dependency>
 		</dependencies>
 	
 	<reporting>

Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/runtime/pom.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -6,7 +6,7 @@
 	<artifactId>runtime</artifactId>
 	<packaging>pom</packaging>
 	<version>1.0-SNAPSHOT</version>
-	<name>JBoss Overlord - Runtime</name>
+	<name>Overlord::Runtime</name>
 	<url>http://www.jboss.org/overlord</url>
 
     <parent>

Deleted: trunk/samples/esb/purchasing/system/.classpath
===================================================================
--- trunk/samples/esb/purchasing/system/.classpath	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/.classpath	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jbossesb-config-model-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/jbossesb-rosetta.jar"/>
-	<classpathentry kind="lib" path="lib/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/org.pi4soa.common.jar"/>
-	<classpathentry kind="lib" path="lib/org.pi4soa.jbossesb.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>

Modified: trunk/samples/esb/purchasing/system/build.xml
===================================================================
--- trunk/samples/esb/purchasing/system/build.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/build.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,24 +1,11 @@
-<project name="purchasing" default="deploy" basedir=".">
-
-	<property name="deploy.dir" value="/var/local/jboss-4.2.2.GA/server/default/deploy" />
-	
-	<property name="build.dir" value="${basedir}/build" />
-	<property name="dist.dir" value="${build.dir}/dist" />
-	<property name="classes.dir" value="${build.dir}/classes" />
-	<property name="src.dir" value="${basedir}/src" />
-	<property name="conf.dir" value="${basedir}/conf" />
+<project name="purchasing" default="startdb" basedir=".">
+	<property name="M2_REPO" value="/opt/m2/repo" />
 	<property name="database.dir" value="${basedir}/database" />
-    <property name="jms.service.file" value="jbmq-queue-service.xml"/>
         
-	<path id="project.classpath">
-	   <fileset dir="${basedir}/lib">
-		 <include name="**/*.jar" />
-	   </fileset>
-	   <fileset dir="${basedir}/lib/hibernate">
-		   <include name="**/*.jar" />
-		   <exclude name="**/hibernate-tools.jar" />
-		   <exclude name="**/hibernation-commons-annotations.jar" />
-	   </fileset>
+	<path id="database.classpath">
+      	 <fileset dir="${M2_REPO}" >
+		<include name="hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar" />
+	 </fileset>
 	</path>
 
     <!-- Start the HSQL DB server -->
@@ -27,7 +14,7 @@
         <delete dir="${database.dir}"/>
         <java classname="org.hsqldb.Server"
               fork="yes"
-              classpathref="project.classpath"
+              classpathref="database.classpath"
               failonerror="true">
             <arg value="-database.0"/>
             <arg value="file:${database.dir}/db"/>
@@ -39,7 +26,7 @@
         <java
             classname="org.hsqldb.util.DatabaseManagerSwing"
             fork="yes"
-            classpathref="project.classpath"
+            classpathref="database.classpath"
             failonerror="true">
             <arg value="-url"/>
             <arg value="jdbc:hsqldb:hsql://localhost/"/>
@@ -47,72 +34,5 @@
             <arg value="org.hsqldb.jdbcDriver"/>
         </java>
     </target>
-
-
-	<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask"
-	 classpathref="project.classpath"/>
-
-	 <target name="schemaexport" depends="compile"
-		description="Exports a generated schema to DB and file">
-		<hibernatetool destdir="${basedir}">
-		<classpath>
-			<pathelement path="${project.classpath}" />
-			<path location="${classes.dir}" />
-		</classpath>
-		<annotationconfiguration configurationfile="${classes.dir}/hibernate.cfg.xml" />
-		<hbm2ddl
-			create="true"
-			drop="true"
-			export="true"
-			outputfilename="purchasing-ddl.sql"
-			delimiter=";"
-			format="true"/>
-		</hibernatetool>
-	 </target>
 	
-
-	<!-- Clean up -->
-	<target name="clean">
-	<delete dir="${build.dir}"/>
-	<mkdir dir="${build.dir}"/>
-	<mkdir dir="${classes.dir}" />
-	</target>
-	
-	<target name="copymetafiles">
-		<copy todir="${classes.dir}">
-			<fileset dir="${conf.dir}">
-				<include name="hibernate.cfg.xml"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<!-- Compile Java source -->
-	<target name="compile" depends="clean,copymetafiles">
-	<javac srcdir="${src.dir}"  destdir="${classes.dir}" debug="true">
-	     <classpath refid="project.classpath"/>
-	</javac>
-	</target>
-
-	<target name="deploy" depends="compile" >
-	   
-	  <mkdir dir="${dist.dir}" />	
-    	  <copy todir="${basedir}/build/META-INF">
-            <fileset dir="conf" includes="jboss-esb.xml,deployment.xml" />
-    	  </copy>
-
-          <jar destfile="${dist.dir}/purchasing.esb">
-    	    <fileset dir="${classes.dir}" />            
-  	    	<fileset dir="${build.dir}" includes="META-INF/**" />
-    	    <fileset dir="${basedir}/conf" >
-				<include name="${jms.service.file}" />
-			</fileset>
-			<fileset dir="${basedir}/lib/hibernate">
-				<include name="**/hibernate-commons-annotations.jar" />
-			</fileset>
-    	  </jar>
-
-		  <copy file="${dist.dir}/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
-	
-        </target>
-	
 </project>

Added: trunk/samples/esb/purchasing/system/pom.xml
===================================================================
--- trunk/samples/esb/purchasing/system/pom.xml	                        (rev 0)
+++ trunk/samples/esb/purchasing/system/pom.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -0,0 +1,121 @@
+<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.samples</groupId>
+	<artifactId>jbossesb-purchasing</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<packaging>jboss-esb</packaging>
+	<name>Overlord::Samples::Purchasing</name>
+	<url>http://www.jboss.org/overlord</url>
+	
+	<parent>
+		<groupId>org.jboss.soa.overlord</groupId>
+		<artifactId>samples</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+	    <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations>
+		<hibernate-tools-version>3.2.0.ga</hibernate-tools-version>
+		<hsqldb-version>1.8.0.7</hsqldb-version>
+	</properties>
+	
+		<dependencies>	
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.14</version>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.soa.overlord</groupId>
+				<artifactId>runtime-jbossesb</artifactId>
+				<version>1.0-SNAPSHOT</version>
+			</dependency>
+
+		    <dependency>
+			    <groupId>org.hibernate</groupId>
+			    <artifactId>hibernate-commons-annotations</artifactId>
+			    <version>${hibernate-commons-annotations}</version>
+		    </dependency>
+
+		    <dependency>
+			    <groupId>org.hibernate</groupId>
+			    <artifactId>hibernate-tools</artifactId>
+			    <version>${hibernate-tools-version}</version>
+		    </dependency>
+
+			<dependency>
+			    <groupId>hsqldb</groupId>
+				<artifactId>hsqldb</artifactId>
+				<version>${hsqldb-version}</version>
+			</dependency>
+
+		</dependencies>
+
+		<build>
+		    <finalName>purchasing</finalName>
+		    <plugins>
+		      <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-antrun-plugin</artifactId>
+			<executions>
+                          <!--export schemas to database -->
+			  <execution>
+			    <id>schemaexport</id>
+			    <phase>compile</phase>
+			    <configuration>
+			      <tasks>
+				<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" 
+					 classpathref="maven.compile.classpath"/>
+                                <hibernatetool destdir=".">
+				<classpath>
+					<pathelement path="maven.compile.classpath" />
+				</classpath>
+				<annotationconfiguration configurationfile="target/classes/hibernate.cfg.xml" />
+				<hbm2ddl
+					create="true"
+					drop="true"
+					export="true"
+					outputfilename="purchasing-ddl.sql"
+					delimiter=";"
+					format="true"/>
+				</hibernatetool>
+			      </tasks>
+			    </configuration>
+			    <goals>
+			      <goal>run</goal>
+			    </goals>
+			  </execution>
+
+			  <!--Deploy esb artifact to JBoss AS/ESB -->
+			  <execution>
+			    <id>deploy</id>
+			    <phase>install</phase>
+			    <configuration>
+			      <tasks>
+                   		   <property name="deploy.dir" value="/var/local/jboss-4.2.2.GA/server/default/deploy" />
+				   <copy file="target/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
+			      </tasks>
+			    </configuration>
+			    <goals>
+			      <goal>run</goal>
+			    </goals>
+			  </execution>
+
+			</executions>
+		      </plugin>		      
+		    </plugins>
+		</build>
+	
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+	    </plugins>
+	</reporting>
+	
+</project>
+

Copied: trunk/samples/esb/purchasing/system/src/main/resources/META-INF/deployment.xml (from rev 38, trunk/samples/esb/purchasing/system/src/main/resources/deployment.xml)
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/META-INF/deployment.xml	                        (rev 0)
+++ trunk/samples/esb/purchasing/system/src/main/resources/META-INF/deployment.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -0,0 +1,14 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker_reply</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker1</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker2</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker3</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker4</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker5</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker6</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker7</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1</depends>
+  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2</depends>
+</jbossesb-deployment>

Copied: trunk/samples/esb/purchasing/system/src/main/resources/META-INF/jboss-esb.xml (from rev 38, trunk/samples/esb/purchasing/system/src/main/resources/jboss-esb.xml)
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/META-INF/jboss-esb.xml	                        (rev 0)
+++ trunk/samples/esb/purchasing/system/src/main/resources/META-INF/jboss-esb.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -0,0 +1,357 @@
+<?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="5000">
+
+	<providers>
+		<jms-provider name="JBossMQ" connection-factory="ConnectionFactory" 
+					jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+					jndi-URL="localhost">
+			<jms-bus busid="BrokerService">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker" />
+			</jms-bus>
+			<jms-bus busid="BrokerService1">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker1" />
+			</jms-bus>
+			<jms-bus busid="BrokerService2">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker2"/>
+			</jms-bus>
+			<jms-bus busid="BrokerService3">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker3"/>
+			</jms-bus>
+			<jms-bus busid="BrokerService4">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker4"/>
+			</jms-bus>
+			<jms-bus busid="BrokerService5">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker5"/>
+			</jms-bus>
+			<jms-bus busid="BrokerService6">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker6"/>
+			</jms-bus>
+			<jms-bus busid="BrokerService7">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker7"/>
+			</jms-bus>
+			<jms-bus busid="CreditAgencyService">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency" />
+			</jms-bus>
+			<jms-bus busid="CreditAgencyService1">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency1" />
+			</jms-bus>
+			<jms-bus busid="CreditAgencyService2">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency2" />
+			</jms-bus>
+		</jms-provider>
+
+	</providers>
+	<services>    
+
+		<service category="PurchaseGoods.Broker" name="Broker.main" description="">
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
+							process="process" name="a1">
+					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="a2">
+					<property name="operation" value="buy" />
+					<property name="messageType" value="BuyRequest" />
+					<property name="clientEPR" value="client" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+				<action class="com.acme.services.broker.SetCreditCheckRequestMessageAction"
+							process="process" name="a3">
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="a4">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckRequest" />
+					<property name="serviceName" value="CreditAgency.main" />
+					<property name="serviceCategory" value="PurchaseGoods.CreditAgency" />
+					<property name="responseServiceName" value="CreditResponse" />
+					<property name="responseServiceCategory" value="PurchaseGoods.Broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.Broker" name="CreditResponse" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService2"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+			  <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction"
+							process="process" name="b1">
+					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
+					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
+				  	<property name="serviceName" value="CreditResponse" />
+					<property name="serviceCategory" value="PurchaseGoods.Broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction"
+							process="process" name="b2">
+					<property name="paths">
+						<case service-category="PurchaseGoods.Broker"
+								service-name="CreditResponse1" >
+							<message type="CreditCheckResponse" />
+						</case>
+						<case service-category="PurchaseGoods.Broker"
+								service-name="CreditResponse2" >
+							<message type="CreditCheckInvalid" />
+						</case>
+					</property>				
+				</action>
+			</actions>
+		</service>
+	
+		<service category="PurchaseGoods.Broker" name="CreditResponse1" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService3"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="b4">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckResponse" />
+					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ParallelAction"
+							process="process" name="b5">
+					<property name="paths">
+						<path service-category="PurchaseGoods.Broker"
+								service-name="BrokerBranch1"
+								immediate="true" />
+						<path service-category="PurchaseGoods.Broker"
+								service-name="BrokerBranch2" 
+								immediate="true" />
+						<join service-category="PurchaseGoods.Broker"
+								service-name="ReturnBuyerResponse" />
+					</property>				
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.Broker" name="BrokerBranch1" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService4"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
+							process="process" name="b7">
+					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
+					<property name="serviceName" value="ReturnBuyerResponse" />
+					<property name="serviceCategory" value="PurchaseGoods.Broker" />
+					<property name="immediate" value="false" />
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.Broker" name="BrokerBranch2" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService5"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
+							process="process" name="b9">
+					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
+					<property name="serviceName" value="ReturnBuyerResponse" />
+					<property name="serviceCategory" value="PurchaseGoods.Broker" />
+					<property name="immediate" value="false" />
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.Broker" name="ReturnBuyerResponse" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService6"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="com.acme.services.broker.SetBuyResponseMessageAction"
+							process="process" name="b11">
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="b12">
+					<property name="operation" value="buy" />
+					<property name="messageType" value="BuyResponse" />
+					<property name="clientEPR" value="client" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+			</actions>
+		</service>
+	
+		<service category="PurchaseGoods.Broker" name="CreditResponse2" description="" >
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="BrokerService7"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="b14">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckInvalid" />
+					<property name="ReceiveMessageAction" value="{http://www.jboss.org/overlord/purchase}Broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+				<action class="com.acme.services.broker.SetBuyFailedMessageAction"
+							process="process" name="b15">
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="b16">
+					<property name="operation" value="buy" />
+					<property name="faultName" value="BuyFailed" />
+					<property name="messageType" value="BuyFailed" />
+					<property name="clientEPR" value="client" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.main" description="">
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="CreditAgencyService"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
+							process="process" name="c1">
+					<property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" />
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="c2">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckRequest" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>			
+				<action class="org.jboss.soa.overlord.jbossesb.actions.IfAction"
+							process="process" name="c3">
+					<property name="paths">
+						<if decision-method="isCreditValid"
+								service-category="PurchaseGoods.CreditAgency"
+								service-name="CreditAgency.decision1"
+								immediate="true" />
+						<else service-category="PurchaseGoods.CreditAgency"
+								service-name="CreditAgency.decision2"
+								immediate="true" />
+					</property>				
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision1" description="">
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="CreditAgencyService1"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction"
+							process="process" name="d2">
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="d3">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckResponse" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+			</actions>
+		</service>
+
+		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision2" description="">
+			<listeners>
+				<jms-listener name="BrokerServiceListener"
+							  busidref="CreditAgencyService2"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction"
+							process="process" name="e2">
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="e3">
+					<property name="operation" value="checkCredit" />
+					<property name="messageType" value="CreditCheckInvalid" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+						</identity>
+					</property>
+				</action>
+			</actions>
+		</service>
+	</services>
+			
+</jbossesb>

Deleted: trunk/samples/esb/purchasing/system/src/main/resources/deployment.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/deployment.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/deployment.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,14 +0,0 @@
-<jbossesb-deployment>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker_reply</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker1</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker2</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker3</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker4</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker5</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker6</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker7</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1</depends>
-  <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2</depends>
-</jbossesb-deployment>

Modified: trunk/samples/esb/purchasing/system/src/main/resources/hibernate.cfg.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/hibernate.cfg.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/hibernate.cfg.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -58,4 +58,4 @@
 		<mapping class="com.acme.services.creditAgency.CreditAgencyPurchase" />
 		
 	</session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>

Deleted: trunk/samples/esb/purchasing/system/src/main/resources/jbm-queue-service.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/jbm-queue-service.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/jbm-queue-service.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker1"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker2"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker3"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker4"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker5"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker6"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-broker7"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-creditAgency"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-creditAgency1"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.trailblazer.destination:service=Queue,name=esb-creditAgency2"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	 <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Deleted: trunk/samples/esb/purchasing/system/src/main/resources/jboss-esb.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/jboss-esb.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/jboss-esb.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,357 +0,0 @@
-<?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="5000">
-
-	<providers>
-		<jms-provider name="JBossMQ" connection-factory="ConnectionFactory" 
-					jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-					jndi-URL="localhost">
-			<jms-bus busid="BrokerService">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker" />
-			</jms-bus>
-			<jms-bus busid="BrokerService1">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker1" />
-			</jms-bus>
-			<jms-bus busid="BrokerService2">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker2"/>
-			</jms-bus>
-			<jms-bus busid="BrokerService3">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker3"/>
-			</jms-bus>
-			<jms-bus busid="BrokerService4">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker4"/>
-			</jms-bus>
-			<jms-bus busid="BrokerService5">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker5"/>
-			</jms-bus>
-			<jms-bus busid="BrokerService6">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker6"/>
-			</jms-bus>
-			<jms-bus busid="BrokerService7">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-broker7"/>
-			</jms-bus>
-			<jms-bus busid="CreditAgencyService">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency" />
-			</jms-bus>
-			<jms-bus busid="CreditAgencyService1">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency1" />
-			</jms-bus>
-			<jms-bus busid="CreditAgencyService2">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency2" />
-			</jms-bus>
-		</jms-provider>
-
-	</providers>
-	<services>    
-
-		<service category="PurchaseGoods.Broker" name="Broker.main" description="">
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
-							process="process" name="a1">
-					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="a2">
-					<property name="operation" value="buy" />
-					<property name="messageType" value="BuyRequest" />
-					<property name="clientEPR" value="client" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-				<action class="com.acme.services.broker.SetCreditCheckRequestMessageAction"
-							process="process" name="a3">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="a4">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckRequest" />
-					<property name="serviceName" value="CreditAgency.main" />
-					<property name="serviceCategory" value="PurchaseGoods.CreditAgency" />
-					<property name="responseServiceName" value="CreditResponse" />
-					<property name="responseServiceCategory" value="PurchaseGoods.Broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.Broker" name="CreditResponse" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService2"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-			  <action class="org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction"
-							process="process" name="b1">
-					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
-					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
-				  	<property name="serviceName" value="CreditResponse" />
-					<property name="serviceCategory" value="PurchaseGoods.Broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction"
-							process="process" name="b2">
-					<property name="paths">
-						<case service-category="PurchaseGoods.Broker"
-								service-name="CreditResponse1" >
-							<message type="CreditCheckResponse" />
-						</case>
-						<case service-category="PurchaseGoods.Broker"
-								service-name="CreditResponse2" >
-							<message type="CreditCheckInvalid" />
-						</case>
-					</property>				
-				</action>
-			</actions>
-		</service>
-	
-		<service category="PurchaseGoods.Broker" name="CreditResponse1" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService3"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="b4">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckResponse" />
-					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ParallelAction"
-							process="process" name="b5">
-					<property name="paths">
-						<path service-category="PurchaseGoods.Broker"
-								service-name="BrokerBranch1"
-								immediate="true" />
-						<path service-category="PurchaseGoods.Broker"
-								service-name="BrokerBranch2" 
-								immediate="true" />
-						<join service-category="PurchaseGoods.Broker"
-								service-name="ReturnBuyerResponse" />
-					</property>				
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.Broker" name="BrokerBranch1" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService4"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
-							process="process" name="b7">
-					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
-					<property name="serviceName" value="ReturnBuyerResponse" />
-					<property name="serviceCategory" value="PurchaseGoods.Broker" />
-					<property name="immediate" value="false" />
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.Broker" name="BrokerBranch2" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService5"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ScheduleStateAction"
-							process="process" name="b9">
-					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
-					<property name="serviceName" value="ReturnBuyerResponse" />
-					<property name="serviceCategory" value="PurchaseGoods.Broker" />
-					<property name="immediate" value="false" />
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.Broker" name="ReturnBuyerResponse" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService6"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="com.acme.services.broker.SetBuyResponseMessageAction"
-							process="process" name="b11">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="b12">
-					<property name="operation" value="buy" />
-					<property name="messageType" value="BuyResponse" />
-					<property name="clientEPR" value="client" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>
-	
-		<service category="PurchaseGoods.Broker" name="CreditResponse2" description="" >
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="BrokerService7"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="b14">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckInvalid" />
-					<property name="ReceiveMessageAction" value="{http://www.jboss.org/overlord/purchase}Broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-				<action class="com.acme.services.broker.SetBuyFailedMessageAction"
-							process="process" name="b15">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="b16">
-					<property name="operation" value="buy" />
-					<property name="faultName" value="BuyFailed" />
-					<property name="messageType" value="BuyFailed" />
-					<property name="clientEPR" value="client" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.main" description="">
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="CreditAgencyService"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
-							process="process" name="c1">
-					<property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" />
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="c2">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckRequest" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>			
-				<action class="org.jboss.soa.overlord.jbossesb.actions.IfAction"
-							process="process" name="c3">
-					<property name="paths">
-						<if decision-method="isCreditValid"
-								service-category="PurchaseGoods.CreditAgency"
-								service-name="CreditAgency.decision1"
-								immediate="true" />
-						<else service-category="PurchaseGoods.CreditAgency"
-								service-name="CreditAgency.decision2"
-								immediate="true" />
-					</property>				
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision1" description="">
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="CreditAgencyService1"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction"
-							process="process" name="d2">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="d3">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckResponse" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>
-
-		<service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision2" description="">
-			<listeners>
-				<jms-listener name="BrokerServiceListener"
-							  busidref="CreditAgencyService2"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction"
-							process="process" name="e2">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="e3">
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckInvalid" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>
-	</services>
-			
-</jbossesb>

Deleted: trunk/samples/esb/purchasing/system/src/main/resources/jbossesb-properties.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/jbossesb-properties.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/jbossesb-properties.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, 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) 2005-2006,
-  @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
-  These options are described in the JBossESB manual.
-  Defaults are provided here for convenience only.
- 
-  Please read through this file prior to using the system, and consider
-  updating the specified entries.
--->
-<esb
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
-    <properties name="core">
-		<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
-		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
-		<property name="org.jboss.soa.esb.persistence.connection.factory" 	value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
-    </properties>
-    <properties name="registry">      
-    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
-    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
-    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
-    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
-    	<property name="org.jboss.soa.esb.registry.implementationClass" 
-    		value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
-    	<property name="org.jboss.soa.esb.registry.factoryClass" 
-    		value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
-    	<property name="org.jboss.soa.esb.registry.user" 
-    		value="jbossesb"/>
-    	<property name="org.jboss.soa.esb.registry.password" 
-    	  value="password"/>
-    	<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
-    	<property name="org.jboss.soa.esb.scout.proxy.transportClass" 
-    		value="org.apache.ws.scout.transport.RMITransport"/>
-    </properties>
-    <properties name="transports" depends="core">
-    	<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
-    	<property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
-    	<property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
-    	<property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
-    </properties>
-    <properties name="connection">
-    	<property name="min-pool-size" value="5"/>
-    	<property name="max-pool=size" value="10"/>
-    	<property name="blocking-timeout-millis" value="5000"/>
-    	<property name="abandoned-connection-timeout" value="10000"/>
-    	<property name="abandoned-connection-time-interval" value="30000"/>
-    </properties>
-    <properties name="dbstore">
-	       <property name="org.jboss.soa.esb.persistence.db.conn.manager" 		value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>	    
-
-		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/"/>
-		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
-		<property name="org.jboss.soa.esb.persistence.db.user" 			value="sa"/>
-		<property name="org.jboss.soa.esb.persistence.db.pwd" 			value=""/>		
-		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"	value="5"/>
-		<!--table managed by pool to test for valid connections - created by pool automatically -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Modified: trunk/samples/esb/purchasing/system/src/main/resources/log4j.xml
===================================================================
--- trunk/samples/esb/purchasing/system/src/main/resources/log4j.xml	2008-06-20 03:39:06 UTC (rev 38)
+++ trunk/samples/esb/purchasing/system/src/main/resources/log4j.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -21,9 +21,9 @@
    <!-- ================================= -->
 
    <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="File" value="./trailblazer.log"/>
+   <appender name="FILE" class="org.apache.log4j.FileAppender">
+      <!--errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/-->
+      <param name="File" value="./purchasing.log"/>
       <param name="Append" value="false"/>
 
       <!-- Rollover at midnight each day -->
@@ -62,7 +62,7 @@
    <!-- ============================== -->
 
    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <!--errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/-->
       <param name="Target" value="System.out"/>
 
       <layout class="org.apache.log4j.PatternLayout">
@@ -204,9 +204,6 @@
    <category name="org.milyn.cdr.XMLConfigDigester">
       <priority value="INFO"/>
    </category>
-   <category name="org.jboss.soa.esb.samples.trailblazer">
-      <priority value="INFO"/>
-   </category>
 
 
    <!-- ======================= -->
@@ -214,6 +211,7 @@
    <!-- ======================= -->
 
    <root>
+      <priority value="INFO" />
       <appender-ref ref="CONSOLE"/>
       <appender-ref ref="FILE"/>
    </root>

Added: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml	                        (rev 0)
+++ trunk/samples/pom.xml	2008-06-20 11:26:10 UTC (rev 39)
@@ -0,0 +1,47 @@
+<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</groupId>
+	<artifactId>samples</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>Overlord::Samples</name>
+	<url>http://www.jboss.org/overlord</url>
+
+    <parent>
+	    <groupId>org.jboss.soa.overlord</groupId>
+		<artifactId>overlord</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+
+	<modules>
+		<module>esb/purchasing/system</module>
+	</modules>
+
+   <build>
+	<plugins>
+	  <plugin>
+	     <groupId>org.codehaus.mojo</groupId>
+		 <artifactId>jboss-packaging-maven-plugin</artifactId>
+	     <version>2.0-20080130.110241-9</version>
+	     <extensions>true</extensions>
+	  </plugin>
+	</plugins>
+   </build>
+
+	<pluginRepositories>
+	     <pluginRepository>
+		   <releases>
+		      <enabled>false</enabled>
+		   </releases>
+		   <snapshots/>
+		   <id>jboss-plugin-snapshots</id>
+		   <name>JBoss Snapshot Plugin Repository</name>
+		   <url>http://snapshots.repository.codehaus.org</url>
+		 </pluginRepository>
+	</pluginRepositories>
+
+
+</project>
+




More information about the overlord-commits mailing list