[overlord-commits] Overlord SVN: r215 - in cdl/trunk/samples/jbossesb: creditAgency and 7 other directories.

Author: jeff.yuchang Date: 2008-08-04 11:30:18 -0400 (Mon, 04 Aug 2008) New Revision: 215 Removed: cdl/trunk/samples/jbossesb/creditAgency/build.xml cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/hibernate.cfg.xml cdl/trunk/samples/jbossesb/purchasing/build.xml cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml Modified: cdl/trunk/samples/jbossesb/README.txt cdl/trunk/samples/jbossesb/creditAgency/pom.xml cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/purchasing/pom.xml cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/deployment.xml Log: [SOAG-29] Separating esb artifacts. * CDL based artifacts are only depedent on runtime-jbossesb.jar. * The packaging should not include any libraries, since in the deployment, it is already having cdl-jbossesb.esb. * Remove the build.xml, as now it uses the JBossAS default DB, doesn't need to start another one. Modified: cdl/trunk/samples/jbossesb/README.txt =================================================================== --- cdl/trunk/samples/jbossesb/README.txt 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/README.txt 2008-08-04 15:30:18 UTC (rev 215) @@ -23,9 +23,12 @@ - Before jbossesb-rosetta.jar and jbossesb-config-model.jar get published in jboss maven repository, you need to install these two artifacts into your local repository by using following commands: -mvn install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> - -DartifactId=<artifact-id> -Dversion=<version> -Dpackaging=<packaging> +mvn install:install-file -Dfile=<path-to-rosetta> -DgroupId=org.jboss.jbossesb + -DartifactId=rosetta -Dversion=4.3 -Dpackaging=jar +mvn install:install-file -Dfile=<path-to-configmodel> -DgroupId=org.jboss.jbossesb + -DartifactId=config-model -Dversion=1.0.1 -Dpackaging=jar + Notice: Here we are using jbossesb-rosetta 4.3 version, jbossesb-config-model 1.0.1 version. Deleted: cdl/trunk/samples/jbossesb/creditAgency/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/build.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/creditAgency/build.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,38 +0,0 @@ -<project name="purchasing" default="startdb" basedir="."> - <property name="M2_REPO" value="/opt/m2/repo" /> - <property name="database.dir" value="${basedir}/database" /> - - <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 --> - <target name="startdb" description="Run HSQL database server with clean DB"> - <!-- Delete database files --> - <delete dir="${database.dir}"/> - <java classname="org.hsqldb.Server" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-database.0"/> - <arg value="file:${database.dir}/db"/> - </java> - </target> - - <!-- Start the HSQL DB browser tool --> - <target name="dbmanager" description="Start HSQL DB manager"> - <java - classname="org.hsqldb.util.DatabaseManagerSwing" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-url"/> - <arg value="jdbc:hsqldb:hsql://localhost/"/> - <arg value="-driver"/> - <arg value="org.hsqldb.jdbcDriver"/> - </java> - </target> - -</project> Modified: cdl/trunk/samples/jbossesb/creditAgency/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/pom.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/creditAgency/pom.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -20,102 +20,20 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl</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> <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>${hsqldb-version}</version> </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - </dependency> </dependencies> <build> <finalName>creditAgency</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> - <copy file="target/creditAgency.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> Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-08-04 15:30:18 UTC (rev 215) @@ -19,19 +19,16 @@ */ package com.acme.services.creditAgency; +import java.io.Serializable; + import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Table; -import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; @Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.purchasing@CreditAgency",root=true) -@Entity -@Table(name="T_CA_PURCHASE") -public class CreditAgencyPurchase implements HibernateObject { +public class CreditAgencyPurchase implements Serializable { @Id @GeneratedValue @Column(name="ID") Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/deployment.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/deployment.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,11 +1,6 @@ <jbossesb-deployment> + <depends>jboss.esb:deployment=cdl-jbossesb.esb</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> - <loader-repository> - org.jboss.soa.overlord.creditAgency:loader=creditAgency - <loader-repository-config> - java2ParentDelegaton=false - </loader-repository-config> - </loader-repository> </jbossesb-deployment> Deleted: cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/hibernate.cfg.xml =================================================================== --- cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/hibernate.cfg.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/hibernate.cfg.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,79 +0,0 @@ -<!DOCTYPE hibernate-configuration SYSTEM -"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<!-- - 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, - @author JBoss Inc. ---> -<hibernate-configuration> - <session-factory> - <!--property name="hibernate.connection.driver_class"> - org.gjt.mm.mysql.Driver - </property> - <property name="hibernate.connection.url"> - jdbc:mysql://localhost:3306/cdl - </property> - <property name="hibernate.connection.username"> - root - </property> - <property name="hibernate.connection.password"> - jeff - </property> - <property name="hibernate.dialect"> - org.hibernate.dialect.MySQL5Dialect - </property--> - - <property name="hibernate.connection.driver_class"> - org.hsqldb.jdbcDriver - </property> - <property name="hibernate.connection.url"> - jdbc:hsqldb:hsql://localhost - </property> - <property name="hibernate.connection.username"> - sa - </property> - <property name="hibernate.dialect"> - org.hibernate.dialect.HSQLDialect - </property> - - <!-- Use the C3P0 connection pool provider --> - <property name="hibernate.c3p0.min_size">5</property> - <property name="hibernate.c3p0.max_size">20</property> - <property name="hibernate.c3p0.timeout">300</property> - <property name="hibernate.c3p0.max_statements">50</property> - <property name="hibernate.c3p0.idle_test_period">3000</property> - - <property name="current_session_context_class">thread</property> - <property name="hibernate.connection.isolation">4</property> - - <!-- Show and print nice SQL on stdout --> - <property name="show_sql">false</property> - <property name="format_sql">true</property> - - <!-- List of annotationed classes (Internal conversation class)--> - <mapping class="org.jboss.soa.overlord.conversation.Session" /> - <mapping class="org.jboss.soa.overlord.conversation.ScheduleItem"/> - <mapping class="org.jboss.soa.overlord.conversation.JoinState"/> - <mapping class="org.jboss.soa.overlord.conversation.Identity"/> - <mapping class="org.jboss.soa.overlord.conversation.EPRWrapper"/> - - <!-- List of Business State class --> - <mapping class="com.acme.services.creditAgency.CreditAgencyPurchase" /> - - </session-factory> -</hibernate-configuration> Deleted: cdl/trunk/samples/jbossesb/purchasing/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/build.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/purchasing/build.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,38 +0,0 @@ -<project name="purchasing" default="startdb" basedir="."> - <property name="M2_REPO" value="/opt/m2/repo" /> - <property name="database.dir" value="${basedir}/database" /> - - <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 --> - <target name="startdb" description="Run HSQL database server with clean DB"> - <!-- Delete database files --> - <delete dir="${database.dir}"/> - <java classname="org.hsqldb.Server" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-database.0"/> - <arg value="file:${database.dir}/db"/> - </java> - </target> - - <!-- Start the HSQL DB browser tool --> - <target name="dbmanager" description="Start HSQL DB manager"> - <java - classname="org.hsqldb.util.DatabaseManagerSwing" - fork="yes" - classpathref="database.classpath" - failonerror="true"> - <arg value="-url"/> - <arg value="jdbc:hsqldb:hsql://localhost/"/> - <arg value="-driver"/> - <arg value="org.hsqldb.jdbcDriver"/> - </java> - </target> - -</project> Modified: cdl/trunk/samples/jbossesb/purchasing/pom.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/pom.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/purchasing/pom.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -7,7 +7,7 @@ <version>1.0-SNAPSHOT</version> <packaging>jboss-esb</packaging> <name>Overlord::CDL::Samples::Purchasing</name> - <url>http://www.jboss.org/overlord</url> + <url>http://www.jboss.org/soag</url> <parent> <groupId>org.jboss.soa.overlord.cdl</groupId> @@ -20,102 +20,19 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.soa.overlord.cdl</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> <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>${hsqldb-version}</version> </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</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> - <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> Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-08-04 15:30:18 UTC (rev 215) @@ -19,19 +19,16 @@ */ package com.acme.services.broker; +import java.io.Serializable; + import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Table; -import org.jboss.soa.overlord.conversation.HibernateObject; import org.jboss.soa.overlord.jbossesb.actions.Service; @Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="overlord.cdl.samples.purchasing@Broker", root=true) -@Entity -@Table(name = "T_PURCHASE_GOOD") -public class PurchaseGoods implements HibernateObject{ +public class PurchaseGoods implements Serializable{ @Id @GeneratedValue @Column(name="PG_ID") Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/deployment.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/deployment.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,4 +1,5 @@ <jbossesb-deployment> + <depends>jboss.esb:deployment=cdl-jbossesb.esb</depends> <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> @@ -8,10 +9,4 @@ <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> - <loader-repository> - org.jboss.soa.overlord.purchasing:loader=purchasing - <loader-repository-config> - java2ParentDelegaton=true - </loader-repository-config> - </loader-repository> </jbossesb-deployment> Deleted: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml 2008-08-04 15:11:28 UTC (rev 214) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/hibernate.cfg.xml 2008-08-04 15:30:18 UTC (rev 215) @@ -1,79 +0,0 @@ -<!DOCTYPE hibernate-configuration SYSTEM -"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<!-- - 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, - @author JBoss Inc. ---> -<hibernate-configuration> - <session-factory> - <!--property name="hibernate.connection.driver_class"> - org.gjt.mm.mysql.Driver - </property> - <property name="hibernate.connection.url"> - jdbc:mysql://localhost:3306/cdl - </property> - <property name="hibernate.connection.username"> - root - </property> - <property name="hibernate.connection.password"> - jeff - </property> - <property name="hibernate.dialect"> - org.hibernate.dialect.MySQL5Dialect - </property--> - - <property name="hibernate.connection.driver_class"> - org.hsqldb.jdbcDriver - </property> - <property name="hibernate.connection.url"> - jdbc:hsqldb:hsql://localhost - </property> - <property name="hibernate.connection.username"> - sa - </property> - <property name="hibernate.dialect"> - org.hibernate.dialect.HSQLDialect - </property> - - <!-- Use the C3P0 connection pool provider --> - <property name="hibernate.c3p0.min_size">5</property> - <property name="hibernate.c3p0.max_size">20</property> - <property name="hibernate.c3p0.timeout">300</property> - <property name="hibernate.c3p0.max_statements">50</property> - <property name="hibernate.c3p0.idle_test_period">3000</property> - - <property name="current_session_context_class">thread</property> - <property name="hibernate.connection.isolation">4</property> - - <!-- Show and print nice SQL on stdout --> - <property name="show_sql">false</property> - <property name="format_sql">true</property> - - <!-- List of annotationed classes (Internal conversation class)--> - <mapping class="org.jboss.soa.overlord.conversation.Session" /> - <mapping class="org.jboss.soa.overlord.conversation.ScheduleItem"/> - <mapping class="org.jboss.soa.overlord.conversation.JoinState"/> - <mapping class="org.jboss.soa.overlord.conversation.Identity"/> - <mapping class="org.jboss.soa.overlord.conversation.EPRWrapper"/> - - <!-- List of Business State class --> - <mapping class="com.acme.services.broker.PurchaseGoods" /> - - </session-factory> -</hibernate-configuration>