Author: jeff.yuchang Date: 2008-08-25 03:46:01 -0400 (Mon, 25 Aug 2008) New Revision: 273 Added: cdl/trunk/distribution/src/main/release/install/ cdl/trunk/distribution/src/main/release/install/build.xml cdl/trunk/distribution/src/main/release/install/deployment.properties cdl/trunk/distribution/src/main/release/samples/ cdl/trunk/distribution/src/main/release/samples/jbossesb/ cdl/trunk/distribution/src/main/release/samples/jbossesb/broker/ cdl/trunk/distribution/src/main/release/samples/jbossesb/broker/build.xml cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml cdl/trunk/distribution/src/main/release/samples/jbossesb/creditAgency/ cdl/trunk/distribution/src/main/release/samples/jbossesb/creditAgency/build.xml cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/build.xml cdl/trunk/distribution/src/main/release/samples/jbossesb/supplier/ cdl/trunk/distribution/src/main/release/samples/jbossesb/supplier/build.xml cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties.xml Modified: cdl/trunk/distribution/src/main/assembly/bin.xml cdl/trunk/distribution/validator/jbossesb/build.xml cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-monitor.xml cdl/trunk/samples/jbossesb/client/build.xml cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java Log: * SOAG-51 Finish the packaging work. Modified: cdl/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-08-24 16:10:30 UTC (rev 272) +++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -35,16 +35,13 @@ <fileSet> <directory>validator/jbossesb</directory> - <outputDirectory>modules/validator-jbossesb</outputDirectory> + <outputDirectory>modules/validator-jbossesb-${cdl.version}</outputDirectory> </fileSet> - <!--Copy files like License, Contributor etc --> + <!--Copy files like License and samples etc --> <fileSet> <directory>src/main/release</directory> <outputDirectory>.</outputDirectory> - <includes> - <include>*.txt</include> - </includes> </fileSet> <fileSet> @@ -82,6 +79,7 @@ <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include> <include>org.jboss.jbossesb:rosetta</include> <include>org.jboss.jbossesb:config-model</include> + <include>log4j:log4j</include> </includes> </dependencySet> <dependencySet> Added: cdl/trunk/distribution/src/main/release/install/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/install/build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,58 @@ +<project name="Overlord_CDL_Installer" default="deploy" basedir="."> + + <!-- Set deployment properties filename --> + <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/> + <property name="org.jboss.esb.deployment.deploy" location="deploy"/> + + <!-- Load Build Properties File --> + <property file="${org.jboss.esb.deployment.properties}"/> + + <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> + <property name="conf.dir" value="${server.dir}/conf"/> + <property name="deploy.dir" value="${server.dir}/deploy"/> + <property name="server.lib.dir" value="${server.dir}/lib"/> + + <property name="modules" value="../modules" /> + + <target name="check.deploy.props"> + <condition property="esb.server.configured"> + <and> + <isset property="org.jboss.esb.server.home"/> + <isset property="org.jboss.esb.server.config"/> + </and> + </condition> + + <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/> + </target> + + <target name="deploy-cdl-runtime-jbossesb" description="Deploys Overlord CDL JBossESB Runtime to the server"> + <echo message="unpack cdl-runtime-jbossesb runtime to JBoss ESB server" /> + <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime-jbossesb.esb" /> + </target> + + <target name="undeploy-cdl-runtime-jbossesb" description="Undeploys Overlord CDL JBossESB Runtime"> + <echo message="Remove the overlord-cdl-runtime-jbossesb.esb from JBoss ESB server" /> + <delete dir="${deploy.dir}/overlord-cdl-runtime-jbossesb.esb" /> + </target> + + <target name="deploy-cdl-validator-jbossesb" depends="check.deploy.props" description="Deploys Overlord CDL JBossESB validator to the server"> + <echo message="Deploy Overlord CDL JBossESB validator" /> + <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="deploy"> + <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/> + <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/> + </ant> + </target> + + <target name="undeploy-cdl-validator-jbossesb" depends="check.deploy.props" description="Undeploys Overlord CDL JBossESB validator to the server"> + <echo message="Undeploy Overlord CDL JBossESB validator" /> + <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="undeploy"> + <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/> + <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/> + </ant> + </target> + + <target name="deploy" depends="deploy-cdl-runtime-jbossesb, deploy-cdl-validator-jbossesb" description="Deploy Overlord CDL components."/> + + <target name="undeploy" depends="undeploy-cdl-runtime-jbossesb, undeploy-cdl-validator-jbossesb" description="Undeploy Overlord CDL components."/> + +</project> Added: cdl/trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- cdl/trunk/distribution/src/main/release/install/deployment.properties (rev 0) +++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,15 @@ +###################################################################### +# JBossAS Configuration +###################################################################### +# The Directory in Which JBoss AS is Installed +# The absolute path to a directory in which a version of JBoss AS with +# EJB3 has been installed. +# This path should not include spaces. +# Use of relative paths or paths with spaces will cause runtime errors +# when deploying and executing the quickstart and the trailblazers. +# (e.g. /home/pbennett/jboss-4.0.5.GA-ejb3) +org.jboss.esb.server.home=/var/local/jboss +# The Configuration of JBoss AS to Use +# (e.g. default) +org.jboss.esb.server.config=default + Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/broker/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/broker/build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/broker/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="broker" default="esbjar" basedir="."> + + <import file="../common_build.xml"/> + +</project> Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,44 @@ +<project name="base-build" basedir="."> + <property name="build.dir" value="${basedir}/target" /> + <property name="classes" value="${build.dir}/classes" /> + <property name="libs" value="../libs" /> + <property name="src" value="src" /> + + <path id="compile-classpath"> + <fileset dir="${libs}" includes="*.jar" /> + </path> + + <target name="init" depends="clean"> + <mkdir dir="${build.dir}" /> + </target> + + <target name="clean"> + <delete dir="${build.dir}" /> + </target> + + <target name="compile" depends="init"> + <mkdir dir="${classes}" /> + <javac srcdir="${src}" destdir="${classes}" debug="true" deprecation="true"> + <classpath refid="compile-classpath" /> + </javac> + <copy todir="${classes}"> + <fileset dir="${src}/main/resources" includes="**/*.xml"/> + </copy> + </target> + + <target name="esbjar" depends="compile"> + <mkdir dir="lib"/> + <jar destfile="${build.dir}/${ant.project.name}.esb"> + <fileset dir="${classes}" /> + <fileset dir="${build.dir}" includes="*.jar,*.war"/> + <fileset dir="${classes}" includes="deployment.xml"/> + <fileset dir="${classes}" includes="META-INF/**" /> + <fileset dir="${basedir}/lib" includes="*.jar"/> + </jar> + </target> + + <target name="deploy" depends="esbjar"> + <copy todir="${org.jboss.esb.server.deploy.dir}" + file="${build.dir}/${ant.project.name}.esb"/> + </target> +</project> Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/creditAgency/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/creditAgency/build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/creditAgency/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="creditAgency" default="esbjar" basedir="."> + + <import file="../common_build.xml"/> + +</project> Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="purchasing" default="esbjar" basedir="."> + + <import file="../common_build.xml"/> + +</project> Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/supplier/build.xml =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/supplier/build.xml (rev 0) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/supplier/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="supplier" default="esbjar" basedir="."> + + <import file="../common_build.xml"/> + +</project> Modified: cdl/trunk/distribution/validator/jbossesb/build.xml =================================================================== --- cdl/trunk/distribution/validator/jbossesb/build.xml 2008-08-24 16:10:30 UTC (rev 272) +++ cdl/trunk/distribution/validator/jbossesb/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -1,12 +1,9 @@ -<project name="governance" default="deploy" basedir="."> +<project name="validator" default="deploy" basedir="."> - <property name="install.dir" value="../"/> - <property file="${install.dir}/deployment.properties"/> - <property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" /> <target name="deploy" depends="register-monitor-filter"> - <echo message="Deploy pi4soa.sar, monitor.esb files to the target server '${target-server}'." /> + <echo message="Deploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files to the target server '${target-server}'." /> <copy todir="${target-server}/deploy/pi4soa.sar"> <fileset dir="${basedir}/pi4soa.sar"/> </copy> @@ -16,7 +13,7 @@ </target> <target name="undeploy" depends="unregister-monitor-filter"> - <echo message="Undeploy pi4soa.sar, monitor.esb files from the target sever '${target-server}'."/> + <echo message="Undeploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files from the target sever '${target-server}'."/> <delete dir="${target-server}/deploy/pi4soa.sar" /> <delete dir="${target-server}/deploy/overlord-cdl-validator-jbossesb.esb" /> </target> @@ -30,7 +27,7 @@ <target name="unregister-monitor-filter"> <echo message="unregister the monitor filter from the jbossesb-properties file" /> <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" /> - <copy file="${install.dir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" /> + <copy file="${basedir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" /> </target> Modified: cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-monitor.xml =================================================================== --- cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-monitor.xml 2008-08-24 16:10:30 UTC (rev 272) +++ cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-monitor.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -32,9 +32,10 @@ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd"> <properties name="core"> <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> - <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/> + <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/> <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> + <property name="jboss.esb.invm.scope.default" value="NONE"/> </properties> <properties name="registry"> <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/> @@ -85,11 +86,10 @@ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/> <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> - </properties> - + </properties> <properties name="filters"> <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> - <property name="org.jboss.soa.esb.filter.10" value="org.pi4soa.jbossesb.monitor.MonitorFilter" /> + <property name="org.jboss.soa.esb.filter.10" value="org.pi4soa.jbossesb.monitor.MonitorFilter" /> </properties> </esb> Added: cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties.xml =================================================================== --- cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties.xml (rev 0) +++ cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -0,0 +1,94 @@ +<?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.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> + <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/> + <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> + <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> + <property name="jboss.esb.invm.scope.default" value="NONE"/> + </properties> + <properties name="registry"> + <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/> + <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#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.LocalTransport"/> + </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"/> + <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/> + <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/> + <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> + <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> + <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> + </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"> + + <!-- connection manager type --> + <!-- <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.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/> + + <!-- this property is only used if using the j2ee connection manager --> + <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/> + + <!-- standalone connection pooling settings --> + <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"/> + <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> + + </properties> + <properties name="filters"> + <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> + <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> + </properties> +</esb> Modified: cdl/trunk/samples/jbossesb/client/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/client/build.xml 2008-08-24 16:10:30 UTC (rev 272) +++ cdl/trunk/samples/jbossesb/client/build.xml 2008-08-25 07:46:01 UTC (rev 273) @@ -1,7 +1,7 @@ <project name="client" default="runClient" basedir="."> <property name="lib.dir" value="${basedir}/lib" /> - <property name="classes.dir" value="${basedir}/classes" /> + <property name="classes.dir" value="${basedir}/target/classes" /> <property name="src.dir" value="${basedir}/src" /> <path id="project.classpath"> 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-24 16:10:30 UTC (rev 272) +++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-08-25 07:46:01 UTC (rev 273) @@ -21,17 +21,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - 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) public class CreditAgencyPurchase implements Serializable { - @Id @GeneratedValue - @Column(name="ID") private long id; public boolean isCreditValid() { 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-24 16:10:30 UTC (rev 272) +++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-08-25 07:46:01 UTC (rev 273) @@ -21,17 +21,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - 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) public class PurchaseGoods implements Serializable{ - @Id @GeneratedValue - @Column(name="PG_ID") private long id; public long getId() {