Author: objectiser Date: 2009-12-06 11:23:07 -0500 (Sun, 06 Dec 2009) New Revision: 114 Modified: validator/trunk/distribution/src/main/assembly/bin.xml validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml validator/trunk/jbossesb/pom.xml validator/trunk/samples/jbossesb/trailblazer/banks/build.xml validator/trunk/samples/jbossesb/trailblazer/build.xml validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java Log: Fix issues related to the trailblazer example (SAVARA-1) Modified: validator/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 16:23:07 UTC (rev 114) @@ -45,7 +45,7 @@ <fileSet> <directory>src/files/jbossesb/conf</directory> - <outputDirectory>/modules</outputDirectory> + <outputDirectory>/modules/conf</outputDirectory> </fileSet> <!-- copy documents --> @@ -99,6 +99,11 @@ <!-- copy client & trailblazer example--> <fileSet> + <directory>../samples/jbossesb/trailblazer</directory> + <outputDirectory>samples/trailblazer</outputDirectory> + </fileSet> + + <fileSet> <directory>../samples/jbossesb/client</directory> <outputDirectory>samples/client</outputDirectory> </fileSet> Modified: validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml =================================================================== --- validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml 2009-12-06 16:23:07 UTC (rev 114) @@ -34,12 +34,12 @@ <orderedlist> <listitem> -Update the <filename>${JBossAS}/server/default/deploy/jbossesb.sar/jbossesb-properties.xml</filename> +Update the <filename>${JBossAS}/server/default/deployers/esb.deployer/jbossesb-properties.xml</filename> file, in the section entitled "transports" and specify all of the SMTP mail server settings for your environment. </listitem> <listitem> -Update the <filename>trailblazer/trailblazer.properties</filename> +Update the <filename>${SAVARA-Validator}/samples/trailblazer/trailblazer.properties</filename> <para> Update the <property>file.bank.monitored.directory</property> and <property>file.output.directory</property> properties. These are folders used by the File Based Bank, @@ -79,11 +79,6 @@ file, and choose the <emphasis>Choreography->Monitor</emphasis> menu item. </para> -<note> -<para> -TO BE UPDATED WITH JOPR APPROACH -</para> -</note> <imageobject> <imagedata fileref="images/MonitorMenu.jpg" align="center" width="2in" /> </imageobject> Modified: validator/trunk/jbossesb/pom.xml =================================================================== --- validator/trunk/jbossesb/pom.xml 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/jbossesb/pom.xml 2009-12-06 16:23:07 UTC (rev 114) @@ -48,17 +48,16 @@ <version>2.0</version> <!-- >scope>provided</scope --> </dependency> + <dependency> <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId> <artifactId>emf-common</artifactId> <version>2.3.0</version> - <!-- >scope>provided</scope --> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId> <artifactId>emf-ecore</artifactId> <version>2.3.1</version> - <!-- >scope>provided</scope --> </dependency> </dependencies> Modified: validator/trunk/samples/jbossesb/trailblazer/banks/build.xml =================================================================== --- validator/trunk/samples/jbossesb/trailblazer/banks/build.xml 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/samples/jbossesb/trailblazer/banks/build.xml 2009-12-06 16:23:07 UTC (rev 114) @@ -3,8 +3,8 @@ <property file="../trailblazer.properties"/> <property name="install.dir" value="../../../install"/> <property file="${install.dir}/deployment.properties"/> - <property name="org.jboss.esb.server.server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" /> - <property name="org.jboss.esb.server.deploy.dir" value="${org.jboss.esb.server.server}/deploy" /> + <property name="org.jboss.as.server" value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> + <property name="org.jboss.as.deploy.dir" value="${org.jboss.as.server}/deploy" /> <!-- Some default build locations --> @@ -18,17 +18,17 @@ <property name="org.jboss.esb.samples.loanbroker.banks.tests.report.dir" value="${basedir}/build/tests"/> <path id="org.jboss.esb.samples.loanbroker.banks.classpath"> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar jboss-aop-client.jar jboss-mdr.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. --> + <fileset dir="${org.jboss.as.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. --> + <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <!-- fileset dir="${org.jboss.as.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" / --> <!-- Required for JMS Client Code. --> <fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/> </path> <path id="org.jboss.esb.samples.loanbroker.banks.testclasspath"> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar jboss-aop-client.jar jboss-mdr.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <!-- fileset dir="${org.jboss.as.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" / --> <!-- Required for JMS Client Code. --> <fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/> <pathelement location="${org.jboss.esb.samples.loanbroker.banks.classes.dir}"/> <pathelement location="${org.jboss.esb.samples.loanbroker.banks.testclasses.dir}"/> Modified: validator/trunk/samples/jbossesb/trailblazer/build.xml =================================================================== --- validator/trunk/samples/jbossesb/trailblazer/build.xml 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/samples/jbossesb/trailblazer/build.xml 2009-12-06 16:23:07 UTC (rev 114) @@ -6,8 +6,8 @@ <property file="${install.dir}/deployment.properties"/> <property name="esb.home.dir" value="${org.jboss.esb.home}"/> - <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}"/> + <property name="org.jboss.as.home" value="${org.jboss.as.home}"/> + <property name="org.jboss.as.config" value="${org.jboss.as.config}"/> <!-- properties for the esb part of the trailblazer --> <property name="esb.dest" value="${basedir}/esb/build"/> @@ -53,13 +53,13 @@ <property name="soa.esb.lib.ext.dir" value="${soa.esb.lib.dir}/ext"/> - <property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" /> + <property name="target-server" value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> <!-- classpath --> <path id="esb.samples.trailblazer.esb.classpath"> <fileset dir="${soa.esb.lib.dir}/ext" includes="*.jar"/> <fileset dir="${esb.lib.dir}/ext" includes="*.jar"/> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/> <fileset dir="${soa.esb.lib.dir}" includes="*.jar"/> <fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/> </path> @@ -71,7 +71,7 @@ <fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/> <fileset dir="${esb.home.dir}/lib/ext" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/> <fileset dir="${soa.esb.lib.ext.dir}" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/> <fileset dir="${soa.esb.lib.dir}" includes="*.jar"/> <fileset dir="${esb.lib.dir}/ext" includes="*.jar"/> <!-- for finding the jbossesb-properties.xml file --> @@ -81,8 +81,8 @@ <path id="esb.samples.trailblazer.esb.classpath.client"> <fileset dir="${soa.esb.lib.ext.dir}"/> <fileset dir="${esb.lib.dir}/ext" includes="*.jar"/> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/> - <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/> + <fileset dir="${org.jboss.as.home}/server/${org.jboss.as.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/> <fileset dir="${soa.esb.lib.dir}" includes="*.jar"/> <fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/> <fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/> @@ -95,13 +95,13 @@ </target> <target name="messaging-config"> - <property name="org.jboss.esb.server.deploy.dir" - value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/> + <property name="org.jboss.as.deploy.dir" + value="${org.jboss.as.home}/server/${org.jboss.as.config}/deploy"/> <condition property="messaging.present"> - <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/> + <available file="${org.jboss.as.deploy.dir}/jboss-messaging"/> </condition> <condition property="messaging.present"> - <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/> + <available file="${org.jboss.as.deploy.dir}/jboss-messaging.sar"/> </condition> <condition property="jbossmq.present"> Modified: validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java =================================================================== --- validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2009-12-06 13:47:06 UTC (rev 113) +++ validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2009-12-06 16:23:07 UTC (rev 114) @@ -32,7 +32,7 @@ import org.jboss.soa.esb.listeners.StandAloneBootStrapper; import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory; import org.jboss.soa.esb.testutils.FileUtil; -import org.jboss.soa.esb.testutils.HsqldbUtil; +//import org.jboss.soa.esb.testutils.HsqldbUtil; import org.jboss.soa.esb.testutils.TestEnvironmentUtil; public class TbBootStrapper extends StandAloneBootStrapper {