Author: alex.guizar(a)jboss.com Date: 2009-06-25 19:03:16 -0400 (Thu, 25 Jun 2009) New Revision: 5124 Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-jbm-service.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-mq-service.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-destinations-service.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml Log: JBPM-2288: Queue configuration for JBM missing (OPEN) incorporate JBM queues descriptor, install MQ descriptor under JBoss 4.0.5-4.2.3 and JBM descriptor under 5.0.1 Deleted: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-destinations-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-destinations-service.xml 2009-06-25 20:12:49 UTC (rev 5123) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-destinations-service.xml 2009-06-25 23:03:16 UTC (rev 5124) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- $Id: jbossmq-destinations-service.xml 25907 2004-11-16 04:32:39Z ejort $ --> - -<!-- - This file defines the default Queues and Topics that jBPM ships with. - The default Queues and Topics are used by the Command Listener Bean - and the producer-consumer pair formed by the JMS Message Service and - the Job Listener Bean. - - You can add other destinations to this file, or you can create other - *-service.xml files to contain your application's destinations. - --> - -<server> - <!-- - Destinations without a configured SecurityManager or without a - SecurityConf will default to role guest with read=true, write=true, - create=false. - --> - - <mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.mq.destination:service=Queue,name=JbpmJobQueue"> - <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> - </mbean> - - <mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue"> - <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> - </mbean> - -</server> Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-jbm-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-jbm-service.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-jbm-service.xml 2009-06-25 23:03:16 UTC (rev 5124) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This file defines the default Queues and Topics that jBPM ships with. + The default Queues and Topics are used by the Command Listener Bean + and the producer-consumer pair formed by the JMS Message Service and + the Job Listener Bean. + + You can add other destinations to this file, or you can create other + *-service.xml files to contain your application's destinations. +--> + +<server> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=JbpmJobQueue" + 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.messaging.destination:service=Queue,name=JbpmCommandQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + +</server> \ No newline at end of file Copied: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-mq-service.xml (from rev 5012, jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-destinations-service.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-mq-service.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/destination/jbpm-mq-service.xml 2009-06-25 23:03:16 UTC (rev 5124) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This file defines the default Queues and Topics that jBPM ships with. + The default Queues and Topics are used by the Command Listener Bean + and the producer-consumer pair formed by the JMS Message Service and + the Job Listener Bean. + + You can add other destinations to this file, or you can create other + *-service.xml files to contain your application's destinations. +--> + +<server> + <!-- + Destinations without a configured SecurityManager or without a + SecurityConf will default to role guest with read=true, write=true, + create=false. + --> + + <mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.mq.destination:service=Queue,name=JbpmJobQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + + <mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + +</server> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-25 20:12:49 UTC (rev 5123) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-25 23:03:16 UTC (rev 5124) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> <installation version="1.0"> - <!-- + <!-- Ant properties in this file can be referenced with @{}, otherwise use variables below in installer files with ${} --> @@ -18,7 +18,7 @@ <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant.jar&quot; stage="both" /> <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant-launcher.jar&quot; stage="both" /> - <!-- Setup the Ant Action Listener --> + <!-- Setup the Ant Action Listener --> <listeners> <listener installer="AntActionInstallerListener" /> </listeners> @@ -103,7 +103,7 @@ <!-- Packs --> <packs> - <!-- + <!-- ******************************** * jBPM Standalone * ******************************** @@ -112,8 +112,10 @@ <description>The jBPM3 Standalone Components</description> <!-- jbpm3/ --> - <file src=&quot;(a){deploy.artifacts.dir}/etc/release.notes.html&quot; targetdir="$INSTALL_PATH" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/etc/JBossORG-EULA.txt&quot; targetdir="$INSTALL_PATH" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/etc/release.notes.html&quot; targetdir="$INSTALL_PATH" + override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/etc/JBossORG-EULA.txt&quot; targetdir="$INSTALL_PATH" + override="true" /> <!-- jbpm3/config --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar&quot; targetdir="$INSTALL_PATH/config" @@ -126,18 +128,22 @@ unpack="true" override="true" /> <!-- jbpm3/designer --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/designer" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/designer" + override="true"> <include name="jbpm-jpdl-designer-site.zip" /> </fileset> <file src=&quot;(a){deploy.artifacts.dir}/etc/version.info.xml&quot; targetdir="$INSTALL_PATH/src/resources/gpd" override="true" /> <!-- jbpm3/examples --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-examples-dist&quot; targetdir="$INSTALL_PATH/examples" override="true" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-examples-dist&quot; targetdir="$INSTALL_PATH/examples" + override="true" /> <!-- jbpm3/docs --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/javadoc&quot; targetdir="$INSTALL_PATH/docs" override="true"/> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="$INSTALL_PATH/docs/userguide" + unpack="true" override="true" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/javadoc&quot; targetdir="$INSTALL_PATH/docs" + override="true" /> <!-- jbpm3/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> @@ -167,7 +173,7 @@ </fileset> </pack> - <!-- + <!-- ******************************** * JBoss Integration * ******************************** @@ -176,11 +182,15 @@ <description>The jBPM3 JBoss Integration</description> <!-- jbpm/jbpm-service.sar --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> <include name="jbpm.cfg.xml" /> <include name="hibernate.extra.hbm.xml" /> </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true"> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> </fileset> @@ -188,73 +198,100 @@ unpack="true" override="true" /> <!-- jbpm/jbpm-enterprise.jar --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" unpack="true" override="true" /> <!-- jbpm/jbpm-userguide.war --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" unpack="true" override="true" /> - <!-- jbpm-destinations-service --> - <file src=&quot;(a){resources.dir}/destination/jbpm-destinations-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <!-- jbpm-mq-service --> + <file src=&quot;(a){resources.dir}/destination/jbpm-mq-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isJBoss405" /> + <file src=&quot;(a){resources.dir}/destination/jbpm-mq-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isJBoss423" /> + <!-- jbpm-jbm-service --> + <file src=&quot;(a){resources.dir}/destination/jbpm-jbm-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isJBoss501" /> + <!-- Database configs to docs/examples/jbpm --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> - <include name="hibernate.cfg.hsqldb.xml"/> - <include name="hibernate.cfg.mysql.xml"/> - <include name="hibernate.cfg.postgresql.xml"/> - <include name="hibernate.cfg.sybase.xml"/> - <include name="hibernate.cfg.oracle.xml"/> - <include name="hibernate.cfg.db2.xml"/> - <include name="jbpm-hsqldb-ds.xml"/> - <include name="jbpm-mysql-ds.xml"/> - <include name="jbpm-postgresql-ds.xml"/> - <include name="jbpm-sybase-ds.xml"/> - <include name="jbpm-oracle-ds.xml"/> - <include name="jbpm-db2-ds.xml"/> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" + override="true"> + <include name="hibernate.cfg.hsqldb.xml" /> + <include name="hibernate.cfg.mysql.xml" /> + <include name="hibernate.cfg.postgresql.xml" /> + <include name="hibernate.cfg.sybase.xml" /> + <include name="hibernate.cfg.oracle.xml" /> + <include name="hibernate.cfg.db2.xml" /> + <include name="jbpm-hsqldb-ds.xml" /> + <include name="jbpm-mysql-ds.xml" /> + <include name="jbpm-postgresql-ds.xml" /> + <include name="jbpm-sybase-ds.xml" /> + <include name="jbpm-oracle-ds.xml" /> + <include name="jbpm-db2-ds.xml" /> </fileset> <!-- Database Hypersonic --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml&quot; condition="isHypersonic" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml&quot; + condition="isHypersonic" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> + <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" + condition="isHypersonic"> <include name="hypersonic/jbpmDB.*" /> </fileset> <!-- Database MySQL --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml&quot; condition="isMySQL" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml&quot; + condition="isMySQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> </fileset> <!-- Database PostgreSQL --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml&quot; condition="isPostgreSQL" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml&quot; + condition="isPostgreSQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isPostgreSQL"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + override="true" condition="isPostgreSQL"> <include name="postgresql.jar" /> </fileset> <!-- Database Sybase --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml&quot; condition="isSybase" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml&quot; + condition="isSybase" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> <!-- Database Oracle --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml&quot; condition="isOracle" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml&quot; + condition="isOracle" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> <!-- Database DB2 --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isDB2"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml&quot; condition="isDB2" + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isDB2" /> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml&quot; + condition="isDB2" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack> - <!-- + <!-- ******************************** * JSF Console * ******************************** @@ -266,7 +303,7 @@ unpack="true" override="true" /> </pack> - <!-- + <!-- ******************************** * Optional Components * ******************************** @@ -279,14 +316,14 @@ <pack name="Download JBoss-5.0.1" required="no" parent="Optional Components" preselected="no"> <description>Download and Install JBoss-5.0.1</description> <!-- http://jira.codehaus.org/browse/IZPACK-158 --> - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller" /> </pack> <!-- Eclipse-3.4.2 --> <pack name="Download Eclipse-3.4.2" required="no" parent="Optional Components" preselected="no"> <description>Download and Install Eclipse-3.4.2</description> <!-- http://jira.codehaus.org/browse/IZPACK-158 --> - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller" /> </pack> </packs>