[savara-commits] savara SVN: r94 - in runtime/trunk: distribution/src/main/release/install and 3 other directories.

Author: objectiser Date: 2009-11-27 13:54:32 -0500 (Fri, 27 Nov 2009) New Revision: 94 Modified: runtime/trunk/distribution/src/main/release/README.txt runtime/trunk/distribution/src/main/release/install/README.txt runtime/trunk/distribution/src/main/release/install/build.xml runtime/trunk/distribution/src/main/release/install/deployment.properties runtime/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml runtime/trunk/docs/samplesguide/src/main/module/convawareesb.xml runtime/trunk/samples/jbossesb/client/build.xml Log: Updated docs based on getting the purchasing example build and deploy working. Modified: runtime/trunk/distribution/src/main/release/README.txt =================================================================== --- runtime/trunk/distribution/src/main/release/README.txt 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/distribution/src/main/release/README.txt 2009-11-27 18:54:32 UTC (rev 94) @@ -1,14 +1,13 @@ -Savara README -=================== +SAVARA Runtime README +===================== -Please refer to the Installation section, within the Getting Started Guide in the docs -folder, which explains how to install the CDL governance capabilities into the -JBossESB environment. +Please refer to the README.txt in the 'install' folder for instructions on +how to install the SAVARA Runtime capabilities into the JBossESB environment. -If you are new to SOA Governance using CDL, then please refer to the Getting Started -Guide in the docs folder. Otherwise more detailed information can be found in the -User Guide within the docs folder. +If you are new to "conversation aware" ESB action concept, then please refer +to the Getting Started Guide and User Guide associated with the SAVARA Eclipse Tools for +more information. The Samples Guide in the docs folder explains how to run some examples demonstrating -the CDL based Governance capabilities. +the execution of ESB services that use the "conversation aware" ESB actions. Modified: runtime/trunk/distribution/src/main/release/install/README.txt =================================================================== --- runtime/trunk/distribution/src/main/release/install/README.txt 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/distribution/src/main/release/install/README.txt 2009-11-27 18:54:32 UTC (rev 94) @@ -1,3 +1,20 @@ -The build.xml script in this directory is responsible for deploying the validator and conversational runtime for JBoss ESB. +Installation instructions for SAVARA Runtime +============================================ -The usage and instructions please refer to $doc/gettingstartedguide Installation chapter for detail. +1) Download JBossAS (http://www.jboss.org/jbossas) - version 5.1.0.GA or higher. Follow the installation +instructions that accompany this distribution. + +2) Download JBossESB (http://www.jboss.org/jbossesb) - version 4.7 or higher. Follow the installation +instructions that accompany this distribution, on how to install the ESB into the JBossAS environment. + +3) Edit the deployment.properties file in this ${SAVARA-Runtime}/install folder. Set the org.jboss.as.home +property to the root directory where the JBossAS environment is located, and change the +org.jboss.as.config property from default if you wish to start your JBossAS using a different +configuration. + +4) Start a command window and execute the command 'ant deploy'. + +5) You should now start your JBossAS server. + +When you wish to uninstall this component, simply go back to the ${SAVARA-Runtime}/install folder +and execute the command 'ant undeploy'. Modified: runtime/trunk/distribution/src/main/release/install/build.xml =================================================================== --- runtime/trunk/distribution/src/main/release/install/build.xml 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/distribution/src/main/release/install/build.xml 2009-11-27 18:54:32 UTC (rev 94) @@ -1,12 +1,12 @@ <project name="SAVARA_Runtime_Installer" default="deploy" basedir="."> <!-- Set deployment properties filename --> - <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/> + <property name="org.jboss.as.deployment.properties" location="deployment.properties"/> <!-- Load Build Properties File --> - <property file="${org.jboss.esb.deployment.properties}"/> + <property file="${org.jboss.as.deployment.properties}"/> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> + <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.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"/> @@ -14,27 +14,26 @@ <property name="modules" value="../modules" /> <target name="check.deploy.props"> - <condition property="esb.server.configured"> + <condition property="as.configured"> <and> - <isset property="org.jboss.esb.server.home"/> - <isset property="org.jboss.esb.server.config"/> + <isset property="org.jboss.as.home"/> + <isset property="org.jboss.as.config"/> </and> </condition> - <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/> + <fail unless="as.configured" message="Cannot determine target deployment, please check deployment.properties"/> </target> - <target name="deploy" description="Deploys Savara Runtime to the server"> - <echo message="Deploy savara runtime to JBoss ESB server" /> + <target name="deploy" description="Deploys SAVARA Runtime to the server"> + <echo message="Deploy SAVARA Runtime to JBoss AS/ESB server" /> <copy todir="${deploy.dir}/savara-runtime-jbossesb.esb"> <fileset dir="${modules}/savara-runtime-jbossesb.esb"/> </copy> </target> - <target name="undeploy" description="Undeploys Savara Runtime"> - <echo message="Undeploy the savara runtime jbossesb from JBoss ESB server" /> + <target name="undeploy" description="Undeploys SAVARA Runtime"> + <echo message="Undeploy the SAVARA Runtime from JBoss AS/ESB server" /> <delete dir="${deploy.dir}/savara-runtime-jbossesb.esb" /> </target> - </project> Modified: runtime/trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- runtime/trunk/distribution/src/main/release/install/deployment.properties 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/distribution/src/main/release/install/deployment.properties 2009-11-27 18:54:32 UTC (rev 94) @@ -6,12 +6,14 @@ # 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. +# when deploying and executing the samples. # (e.g. /local/deploy/jboss-5.1.0.GA) -org.jboss.esb.server.home=/local/deploy/jboss-5.1.0.GA +org.jboss.as.home=/local/deploy/jboss-5.1.0.GA + # The Configuration of JBoss AS to Use # (e.g. default) -org.jboss.esb.server.config=default +org.jboss.as.config=default + # The directory for JBossESB home -# (e.g. /local/deploy/jbossesb-4.6.GA) -org.jboss.esb.home=/local/deploy/jbossesb-4.6.GA +# (e.g. /local/deploy/jbossesb-4.7) +org.jboss.esb.home=/local/deploy/jbossesb-4.7 Modified: runtime/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml =================================================================== --- runtime/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-11-27 18:54:32 UTC (rev 94) @@ -2,12 +2,14 @@ <property file="../../../install/deployment.properties" /> + <property name="modules" value="../../../modules" /> + <property name="build.dir" value="${basedir}/target" /> <property name="classes" value="${build.dir}/classes" /> <property name="libs" value="${basedir}/lib" /> <property name="src" value="src" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> + <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> <path id="example-classpath"> <fileset dir="${libs}" includes="*.jar" /> @@ -28,8 +30,8 @@ <target name="messaging-config" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5"> <condition property="messaging.present"> <or> - <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/> - <available file="${org.jboss.esb.server.deploy.dir}/messaging"/> + <available file="${org.jboss.as.deploy.dir}/jboss-messaging"/> + <available file="${org.jboss.as.deploy.dir}/messaging"/> </or> </condition> <condition property="messaging.present"> @@ -91,32 +93,32 @@ <!-- ==================================================================== --> <!-- This section handles dependencies specific to each distribution. --> <!-- It configures the following properties --> -<!-- org.jboss.esb.server.config, org.jboss.esb.server.home, --> -<!-- org.jboss.esb.server.server and deployment-classpath --> +<!-- org.jboss.as.config, org.jboss.as.home, --> +<!-- org.jboss.as.server and deployment-classpath --> <!-- ==================================================================== --> <target name="check-as-version"> - <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> - <echo message="${org.jboss.esb.server.server}"/> + <property name="org.jboss.as.server" location="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <echo message="${org.jboss.as.server}"/> <!-- Check for JBossAS5 --> <condition property="jbossas5"> - <available file="${org.jboss.esb.server.server}/deployers"/> + <available file="${org.jboss.as.server}/deployers"/> </condition> <!-- Check for JBossAS4.x --> <condition property="jbossas4"> <not> - <available file="${org.jboss.esb.server.server}/deployers"/> + <available file="${org.jboss.as.server}/deployers"/> </not> </condition> </target> <target name="classpath-dependencies-as4" if="jbossas4" depends="messaging-dependencies, jbossmq-dependencies"> <path id="compile-classpath"> - <fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar quartz-all.jar"/> <!-- Required for the helloworld_hibernate_action quickstart --> + <fileset dir="${org.jboss.as.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. --> + <fileset dir="${org.jboss.as.server}/lib" includes="hibernate3.jar quartz-all.jar"/> <!-- Required for the helloworld_hibernate_action quickstart --> <path refid="deployment-classpath" /> <path refid="example-classpath" /> - <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -124,11 +126,11 @@ <pathelement location="." /> <pathelement location="${classes}" /> <pathelement location="${basedir}/src" /> - <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.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.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. --> <path refid="compile-classpath" /> <pathelement location="${pwd}/anttasks/classes" /> </path> @@ -138,12 +140,13 @@ <target name="classpath-dependencies-as5" if="jbossas5" depends="messaging-dependencies, jbossmq-dependencies"> <path id="compile-classpath"> - <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="hibernate-*.jar" /> <!-- Required for jbpm Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="quartz.jar"/> <!-- Required for the helloworld_hibernate_action quickstart --> + <fileset dir="${modules}/savara-runtime-jbossesb.esb" includes="savara-runtime-jbossesb*.jar"/> + <fileset dir="${org.jboss.as.home}/common/lib" includes="hibernate-*.jar" /> <!-- Required for jbpm Client Code. --> + <fileset dir="${org.jboss.as.home}/common/lib" includes="quartz.jar"/> <!-- Required for the helloworld_hibernate_action quickstart --> <pathelement location="${org.jboss.esb.server.common.lib}/commons-httpclient.jar"/> <path refid="deployment-classpath" /> <path refid="example-classpath" /> - <fileset dir="${org.jboss.esb.server.home}/client" excludes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jaxws-rt.jar jaxws-tools.jar" /> + <fileset dir="${org.jboss.as.home}/client" excludes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jaxws-rt.jar jaxws-tools.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -151,12 +154,12 @@ <pathelement location="." /> <pathelement location="${classes}" /> <pathelement location="${basedir}/src" /> - <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="hibernate-*.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/common/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.home}/lib" includes="jboss-aop.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/common/lib" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org.jboss.as.home}/common/lib" includes="hibernate-*.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. --> + <fileset dir="${org.jboss.as.home}/common/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.home}/lib" includes="jboss-aop.jar" /> <!-- Required for JMS Client Code. --> <path refid="compile-classpath" /> <pathelement location="${pwd}/anttasks/classes" /> </path> @@ -166,121 +169,121 @@ <!-- Configure dependencies for jbossesb and source distributions --> <target name="jbossesb-dependencies-as4" if="jbossas4" depends="check-as-version"> - <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> - <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/> + <property name="org.jboss.as.server" location="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="org.jboss.as.deploy.dir" location="${org.jboss.as.server}/deploy"/> <path id="deployment-classpath"> <!-- jbossws jars --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxws.jar jboss-saaj.jar jbossws-common.jar jbossws-spi.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-jaxws.jar jboss-saaj.jar jbossws-common.jar jbossws-spi.jar"/> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.sar/lib" includes="*.jar"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbossesb.sar/lib" includes="*.jar"/> <!-- jbossesb config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbossesb.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbossesb.esb"/> <!-- jbpm config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbpm.esb"/> - <pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar"/> - <pathelement location="${org.jboss.esb.server.server}/lib/dom4j.jar"/> - <pathelement location="${org.jboss.esb.server.server}/lib/antlr.jar"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbpm.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbpm.esb"/> + <pathelement location="${org.jboss.as.server}/lib/cglib.jar"/> + <pathelement location="${org.jboss.as.server}/lib/dom4j.jar"/> + <pathelement location="${org.jboss.as.server}/lib/antlr.jar"/> <!-- smooks config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/smooks.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/smooks.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/smooks.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/smooks.esb"/> <!-- jbrules config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbrules.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbrules.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbrules.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbrules.esb"/> <!-- spring config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/spring.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/spring.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/spring.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/spring.esb"/> <!-- soap config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/soap.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/soap.esb"/> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar"/> + <fileset dir="${org.jboss.as.deploy.dir}/soap.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/soap.esb"/> + <fileset dir="${org.jboss.as.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar"/> <!-- general libs --> - <pathelement location="${org.jboss.esb.server.home}/lib/commons-logging.jar"/> - <pathelement location="${org.jboss.esb.server.home}/lib/commons-codec.jar"/> - <pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/> - <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/> - <pathelement location="${org.jboss.esb.server.server}/lib/jbossts-common.jar"/> - <pathelement location="${org.jboss.esb.server.server}/lib/quartz.jar"/> + <pathelement location="${org.jboss.as.home}/lib/commons-logging.jar"/> + <pathelement location="${org.jboss.as.home}/lib/commons-codec.jar"/> + <pathelement location="${org.jboss.as.home}/lib/jboss-system.jar"/> + <pathelement location="${org.jboss.as.home}/lib/jboss-xml-binding.jar"/> + <pathelement location="${org.jboss.as.server}/lib/jbossts-common.jar"/> + <pathelement location="${org.jboss.as.server}/lib/quartz.jar"/> <!-- includes for read only cache --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-cache*.jar"/> - <pathelement location="${org.jboss.esb.server.server}/lib/jgroups.jar"/> + <fileset dir="${org.jboss.as.server}/lib" includes="jboss-cache*.jar"/> + <pathelement location="${org.jboss.as.server}/lib/jgroups.jar"/> <!-- includes for h2 --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="h2*.jar"/> + <fileset dir="${org.jboss.as.server}/lib" includes="h2*.jar"/> <!-- common client jars --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar"/> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar"/> <!-- common lib jars --> - <fileset dir="${org.jboss.esb.server.home}/lib" includes="commons-httpclient.jar"/> - <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xalan.jar"/> + <fileset dir="${org.jboss.as.home}/lib" includes="commons-httpclient.jar"/> + <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="xalan.jar"/> </path> </target> <!-- Configure dependencies for jbossesb and source distributions --> <target name="jbossesb-dependencies-as5" if="jbossas5" depends="check-as-version"> - <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/> - <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/> - <property name="org.jboss.esb.server.common.lib" location="${org.jboss.esb.server.home}/common/lib"/> + <property name="org.jboss.as.server" location="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="org.jboss.as.deploy.dir" location="${org.jboss.as.server}/deploy"/> + <property name="org.jboss.as.common.lib" location="${org.jboss.as.home}/common/lib"/> <path id="deployment-classpath"> <!-- jbossws jars --> - <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jboss-saaj.jar jbossws-common.jar"/> - <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossws-common.jar jbossws-framework.jar jbossws-native-jaxrpc.jar jbossws-native-saaj.jar jbossws-spi.jar"/> + <fileset dir="${org.jboss.as.common.lib}" includes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jboss-saaj.jar jbossws-common.jar"/> + <fileset dir="${org.jboss.as.common.lib}" includes="jbossws-common.jar jbossws-framework.jar jbossws-native-jaxrpc.jar jbossws-native-saaj.jar jbossws-spi.jar"/> - <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer/lib" includes="*.jar"/> + <fileset dir="${org.jboss.as.server}/deployers/esb.deployer/lib" includes="*.jar"/> <!-- jbossesb.esb jars --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbossesb.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbossesb.esb"/> <!-- jbpm.esb jars --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbpm.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbpm.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbpm.esb"/> - <pathelement location="${org.jboss.esb.server.home}/lib/dom4j.jar"/> - <pathelement location="${org.jboss.esb.server.common.lib}/antlr.jar"/> + <pathelement location="${org.jboss.as.home}/lib/dom4j.jar"/> + <pathelement location="${org.jboss.as.common.lib}/antlr.jar"/> <!-- smooks.esb jars --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/smooks.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/smooks.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/smooks.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/smooks.esb"/> <!-- jbrules.esb jars --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/jbrules.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/jbrules.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/jbrules.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/jbrules.esb"/> <!-- spring.esb jars --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/spring.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/spring.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/spring.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/spring.esb"/> <!-- soap.esb config --> - <fileset dir="${org.jboss.esb.server.deploy.dir}/soap.esb" includes="*.jar"/> - <pathelement location="${org.jboss.esb.server.deploy.dir}/soap.esb"/> + <fileset dir="${org.jboss.as.deploy.dir}/soap.esb" includes="*.jar"/> + <pathelement location="${org.jboss.as.deploy.dir}/soap.esb"/> - <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="activation.jar"/> - <fileset dir="${org.jboss.esb.server.common.lib}" includes="mail.jar, jboss-ejb3x.jar"/> + <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="activation.jar"/> + <fileset dir="${org.jboss.as.common.lib}" includes="mail.jar, jboss-ejb3x.jar"/> <!-- general libs --> - <pathelement location="${org.jboss.esb.server.common.lib}/commons-logging.jar"/> - <pathelement location="${org.jboss.esb.server.common.lib}/quartz.jar"/> + <pathelement location="${org.jboss.as.common.lib}/commons-logging.jar"/> + <pathelement location="${org.jboss.as.common.lib}/quartz.jar"/> - <pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/> - <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/> + <pathelement location="${org.jboss.as.home}/lib/jboss-system.jar"/> + <pathelement location="${org.jboss.as.home}/lib/jboss-xml-binding.jar"/> <!-- includes for read only cache --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="jbosscache-*.jar"/> + <fileset dir="${org.jboss.as.server}/lib" includes="jbosscache-*.jar"/> <!-- includes for h2 --> - <fileset dir="${org.jboss.esb.server.server}/lib" includes="h2*.jar"/> + <fileset dir="${org.jboss.as.server}/lib" includes="h2*.jar"/> - <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xalan.jar"/> + <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="xalan.jar"/> <!-- common client jars --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar"/> - <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar"/> <!-- common lib jars --> - <fileset dir="${org.jboss.esb.server.common.lib}" includes="commons-httpclient.jar"/> + <fileset dir="${org.jboss.as.common.lib}" includes="commons-httpclient.jar"/> </path> </target> Modified: runtime/trunk/docs/samplesguide/src/main/module/convawareesb.xml =================================================================== --- runtime/trunk/docs/samplesguide/src/main/module/convawareesb.xml 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/docs/samplesguide/src/main/module/convawareesb.xml 2009-11-27 18:54:32 UTC (rev 94) @@ -54,7 +54,7 @@ <para> To check conformance, we need to refer to the model and service implementation projects in the Eclipse environment. -The <filename>purchasing-models</filename> project contains the CDL used to perform conformance +The <filename>purchasing-models</filename> project contains the choreography used to perform conformance checking on the <filename>src/main/resources/META-INF/jboss-esb.xml</filename> files within the other projects. A full explanation of the conversation aware ESB actions can be found in the <emphasis>Conversational Aware ESB</emphasis> section of the @@ -97,8 +97,8 @@ <title>Running the Example</title> <orderedlist> <listitem> - First step is to install the ESB services. (Presumely the JBoss ESB server started already) - In a command window, Go to the the <filename>${SAVARA-Runtime}/samples</filename> folder, + After starting the JBoss AS server, the first step is to install the ESB services. + In a command window, go to the <filename>${SAVARA-Runtime}/samples</filename> folder, execute the <emphasis role="bold">ant deploy-purchasing</emphasis>. </listitem> <listitem> @@ -173,7 +173,7 @@ <para> To check conformance, we need to refer to the model and service implementation projects in the Eclipse environment. -The <filename>brokerage-models</filename> project contains the CDL used to perform conformance checking on +The <filename>brokerage-models</filename> project contains the choreography used to perform conformance checking on the <filename>src/main/resources/META-INF/jboss-esb.xml</filename> files within the other brokerage projects. A full explanation of the conversation aware ESB actions can be found in the <emphasis>Conversational Aware ESB</emphasis> section of the Modified: runtime/trunk/samples/jbossesb/client/build.xml =================================================================== --- runtime/trunk/samples/jbossesb/client/build.xml 2009-11-26 21:24:56 UTC (rev 93) +++ runtime/trunk/samples/jbossesb/client/build.xml 2009-11-27 18:54:32 UTC (rev 94) @@ -1,6 +1,8 @@ <project name="client" default="runPurchasingClient" basedir="."> <property file="../../install/deployment.properties" /> + <property name="modules" value="../../modules" /> + <import file="../common_build.xml"/> <target name="runPurchasingClient" depends="compile">