[jbpm-commits] JBoss JBPM SVN: r6549 - in jbpm3/branches/jbpm-3.2-soa: modules/core/src/main/java/org/jbpm/util and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Aug 7 03:52:49 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-08-07 03:52:48 -0400 (Sat, 07 Aug 2010)
New Revision: 6549
Added:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml
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/user-input-spec.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-config.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml
Log:
JBPM-2916 switch to ha-jms for jboss 4.x to make jbpm queues available cluserwide
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-07 07:52:48 UTC (rev 6549)
@@ -78,7 +78,7 @@
#
# Install distro
#
-$JAVA -jar modules/distribution/target/jbpm-installer-$JBPM_VERSION.jar \
+$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \
modules/distribution/target/resources/auto-install-template.xml
#
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/JndiUtil.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/JndiUtil.java 2010-08-07 07:52:48 UTC (rev 6549)
@@ -21,11 +21,16 @@
*/
package org.jbpm.util;
+import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
+import org.jbpm.JbpmContext;
+import org.jbpm.configuration.ObjectFactory;
+
public class JndiUtil {
private JndiUtil() {
@@ -41,8 +46,18 @@
}
}
- private static Object lookup(String jndiName) throws NamingException {
- Context initialContext = new InitialContext();
+ public static Object lookup(String jndiName) throws NamingException {
+ Properties jndiProperties = null;
+ JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
+ if (jbpmContext != null) {
+ ObjectFactory objectFactory = jbpmContext.getObjectFactory();
+ if (objectFactory.hasObject("resource.jndi.properties")) {
+ String jndiResource = (String) objectFactory.createObject("resource.jndi.properties");
+ jndiProperties = ClassLoaderUtil.getProperties(jndiResource);
+ }
+ }
+
+ Context initialContext = new InitialContext(jndiProperties);
try {
return initialContext.lookup(jndiName);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -232,7 +232,6 @@
</goals>
<configuration>
<descriptor>${resources.directory}/installer/install-definition.xml</descriptor>
- <installerFile>${project.build.directory}/jbpm-installer-${project.version}.jar</installerFile>
<kind>installer</kind>
</configuration>
</execution>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<AutomatedInstallation langpack="eng">
<com.izforge.izpack.panels.HelloPanel />
<com.izforge.izpack.panels.TargetPanel>
<installpath>@jbpm.home@</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3 Standalone" index="0" selected="true"/>
- <pack name="jBPM3 JBoss Integration" index="1" selected="true"/>
- <pack name="JSF-Console" index="2" selected="true"/>
- <pack name="Optional Components" index="3" selected="false"/>
- <pack name="Download JBoss-5.0.1" index="4" selected="false"/>
- <pack name="Download Eclipse-3.4.2" index="5" selected="false"/>
+ <pack name="jBPM Engine" index="0" selected="true"/>
+ <pack name="Documentation" index="1" selected="true"/>
+ <pack name="Eclipse Designer" index="2" selected="true"/>
+ <pack name="JBoss AS Integration" index="3" selected="true"/>
+ <pack name="JSF Console" index="4" selected="true"/>
+ <pack name="Optional Downloads" index="5" selected="false"/>
+ <pack name="JBoss AS" index="6" selected="false"/>
+ <pack name="Eclipse" index="7" selected="false"/>
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/download-helper.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -3,14 +3,18 @@
<!-- $Id$ -->
<project name="download-helper">
- <target name="download-jboss" description="Downloads JBoss from SourceForge">
- <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip"
- dest="${install.path}/opt/jboss-5.0.1.GA.zip"
- usetimestamp="true" verbose="yes" />
- <unzip src="${install.path}/opt/jboss-5.0.1.GA.zip" dest="${jboss.home}" />
+ <property name="jboss.version" value="4.2.3.GA" />
+ <property name="eclipse.release" value="galileo" />
+ <property name="eclipse.version" value="SR2" />
+
+ <target name="download-jboss" description="Download JBoss AS from SourceForge">
+ <get src="http://downloads.sourceforge.net/jboss/jboss-${jboss.version}.zip"
+ dest="${install.path}/opt"
+ verbose="yes" />
+ <unzip src="${install.path}/opt/jboss-${jboss.version}.zip" dest="${jboss.home}" />
</target>
- <target name="download-eclipse" description="Downloads Eclipse from ibiblio">
+ <target name="download-eclipse" description="Download Eclipse from Main Download Site">
<condition property="is.linux">
<os name="Linux" />
</condition>
@@ -26,27 +30,28 @@
</target>
<target name="download-eclipse-linux" if="is.linux">
- <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/release/ganymede/SR2/eclipse-java-ganymede-SR2-linux-gtk.tar.gz"
- dest="${install.path}/opt/eclipse-java-ganymede.tar.gz"
- usetimestamp="true" verbose="yes" />
- <untar src="${install.path}/opt/eclipse-java-ganymede.tar.gz"
+ <get src="http://download.eclipse.org/technology/epp/downloads/release/${eclipse.release}/${eclipse.version}/eclipse-java-${eclipse.release}-${eclipse.version}-linux-gtk.tar.gz"
+ dest="${install.path}/opt"
+ verbose="yes" />
+ <untar src="${install.path}/opt/eclipse-java-${eclipse.release}-${eclipse.version}-linux-gtk.tar.gz"
dest="${install.path}"
compression="gzip" />
</target>
<target name="download-eclipse-mac" if="is.mac">
- <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/release/ganymede/SR2/eclipse-java-ganymede-SR2-macosx-carbon.tar.gz"
- dest="${install.path}/opt/eclipse-java-ganymede.tar.gz"
- usetimestamp="true" verbose="yes" />
- <untar src="${install.path}/opt/eclipse-java-ganymede.tar.gz"
+ <get src="http://download.eclipse.org/technology/epp/downloads/release/${eclipse.release}/${eclipse.version}/eclipse-java-${eclipse.release}-${eclipse.version}-macosx-cocoa.tar.gz"
+ dest="${install.path}/opt"
+ verbose="yes" />
+ <untar src="${install.path}/opt/eclipse-java-${eclipse.release}-${eclipse.version}-macosx-cocoa.tar.gz"
dest="${install.path}"
compression="gzip" />
</target>
<target name="download-eclipse-windows" if="is.windows">
- <get src="http://mirrors.ibiblio.org/pub/mirrors/eclipse/technology/epp/downloads/release/ganymede/SR2/eclipse-java-ganymede-SR2-win32.zip"
- dest="${install.path}/opt/eclipse-java-ganymede.zip"
- usetimestamp="true" verbose="yes" />
- <unzip src="${install.path}/opt/eclipse-java-ganymede.tar.gz" dest="${install.path}" />
+ <get src="http://download.eclipse.org/technology/epp/downloads/release/${eclipse.release}/${eclipse.version}/eclipse-java-${eclipse.release}-${eclipse.version}-win32.zip"
+ dest="${install.path}/opt"
+ verbose="yes" />
+ <unzip src="${install.path}/opt/eclipse-java-${eclipse.release}-${eclipse.version}-win32.zip"
+ dest="${install.path}" />
</target>
</project>
\ No newline at end of file
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 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
+
<installation version="1.0">
<!--
Maven properties in this file can be referenced with @{},
@@ -7,7 +8,6 @@
<info>
<appname>@{project.name}</appname>
<appversion>@{project.version}</appversion>
- <url>http://jboss.org/jbpm</url>
<uninstaller path="$INSTALL_PATH/uninstall" />
</info>
<guiprefs width="600" height="440" resizable="yes" />
@@ -122,8 +122,8 @@
* jBPM Standalone *
********************************
-->
- <pack name="jBPM3 Standalone" required="yes" preselected="yes">
- <description>The jBPM3 Standalone Components</description>
+ <pack name="jBPM Engine" required="yes">
+ <description>Standalone process engine and configuration files</description>
<!-- jbpm3/ -->
<file src="@{project.build.assemblyDirectory}/etc/release.notes.html" targetdir="$INSTALL_PATH" />
@@ -137,22 +137,31 @@
<!-- jbpm3/database -->
<file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
unpack="true" />
+ </pack>
+ <pack name="Documentation" required="no">
+ <description>User guide and examples</description>
+
+ <!-- jbpm3/docs -->
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
+ unpack="true" />
+ <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" />
+
+ <!-- jbpm3/examples -->
+ <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
+ targetdir="$INSTALL_PATH/examples" />
+ </pack>
+
+ <pack name="Eclipse Designer" required="no">
+ <description>Process designer archive, plus third-party libraries and source code
+useful to develop and test jBPM applications</description>
+
<!-- jbpm3/designer -->
<fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
<file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd" />
- <!-- jbpm3/examples -->
- <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
- targetdir="$INSTALL_PATH/examples" />
-
- <!-- jbpm3/docs -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
- unpack="true" />
- <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" />
-
<!-- jbpm3/lib -->
<fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
<include name="antlr.jar" />
@@ -187,15 +196,13 @@
* JBoss Integration *
********************************
-->
- <pack name="jBPM3 JBoss Integration" required="no" preselected="yes">
- <description>The jBPM3 JBoss Integration</description>
+ <pack name="JBoss AS Integration" required="no">
+ <description>Application server integration modules</description>
<!-- jbpm/jbpm-service.sar -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
- <include name="jbpm.cfg.xml" />
- <include name="hibernate.extra.hbm.xml" />
- </fileset>
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+ excludes="META-INF" />
<fileset dir="@{project.build.assemblyDirectory}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm-jpdl.jar" />
@@ -222,10 +229,10 @@
<!-- jbpm-mq-service.xml -->
<file src="@{resources.directory}/destination/jbpm-mq-service.xml"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm"
condition="isJBoss405" />
<file src="@{resources.directory}/destination/jbpm-mq-service.xml"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm"
condition="isJBoss423" />
<!-- jbpm-jbm-service.xml -->
@@ -333,8 +340,9 @@
* JSF Console *
********************************
-->
- <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes">
- <description>JSF-Console</description>
+ <pack name="JSF Console" parent="JBoss AS Integration" required="no">
+ <description>Web console based on the Java Server Faces technology</description>
+
<!-- jbpm/jsf-console.war -->
<file src="@{project.build.assemblyDirectory}/lib/jsf-console.war"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war"
@@ -349,25 +357,23 @@
* Optional Components *
********************************
-->
- <pack name="Optional Components" required="no" preselected="no">
- <description>Optional jBPM3 Components</description>
+ <pack name="Optional Downloads" required="no" preselected="no">
+ <description>Optional components</description>
</pack>
- <!-- JBoss-5.0.1 -->
- <pack name="Download JBoss-5.0.1" required="no" parent="Optional Components"
- preselected="no">
- <description>Download and Install JBoss-5.0.1</description>
+ <!-- JBoss AS -->
+ <pack name="JBoss AS" parent="Optional Downloads" required="no" preselected="no">
+ <description>Download a suitable JBoss AS distribution</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
+ <file src="@{resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</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="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
+ <!-- Eclipse -->
+ <pack name="Eclipse" parent="Optional Downloads" required="no" preselected="no">
+ <description>Download a suitable Eclipse distribution</description>
+ <file src="@{resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</pack>
-
</packs>
</installation>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<userInput>
<panel order="0">
- <createForPack name="jBPM3 JBoss Integration" />
+ <createForPack name="JBoss AS Integration" />
<field type="radio" variable="jbossSelection">
<description align="left" id="jboss.selection" />
<spec>
- <choice txt="JBoss 5.1.0" value="jboss510" set="true" />
+ <choice txt="JBoss 5.1.0" value="jboss510" />
<choice txt="JBoss 5.0.1" value="jboss501" />
- <choice txt="JBoss 4.2.3" value="jboss423" />
+ <choice txt="JBoss 4.2.3" value="jboss423" set="true" />
<choice txt="JBoss 4.0.5" value="jboss405" />
</spec>
</field>
@@ -17,13 +17,13 @@
</field>
</panel>
<panel order="1">
- <createForPack name="jBPM3 JBoss Integration" />
+ <createForPack name="JBoss AS Integration" />
<field type="dir" align="left" variable="jbossInstallPath">
<spec id="jboss.home" size="20" set="${jboss.home}" />
</field>
</panel>
<panel order="2">
- <createForPack name="jBPM3 JBoss Integration" />
+ <createForPack name="JBoss AS Integration" />
<field type="radio" variable="dbSelection">
<description align="left" id="database.selection" />
<spec>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-config.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/scripts/assembly-config.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -9,10 +9,6 @@
<fileSet>
<directory>${basedir}/src/main/etc</directory>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>jbpm.cfg.xml</include>
- <include>hibernate.extra.hbm.xml</include>
- </includes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -9,10 +9,13 @@
<service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
</jbpm-context>
- <!-- use the context class loader -->
+ <!-- employ the context class loader -->
<string name="jbpm.class.loader" value="context" />
- <!--
+ <!-- access high-availability jndi -->
+ <string name="resource.jndi.properties" value="jbpm.jndi.properties" />
+
+ <!--
The default job executor needs to be overwritten with a null value.
There should be no job executor in the enterprise configuration.
Async messaging is bound to JMS and scheduling, to EJB timers.
Added: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties 2010-08-07 07:52:48 UTC (rev 6549)
@@ -0,0 +1 @@
+java.naming.provider.url=${jboss.bind.address}:1100
Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -6,8 +6,8 @@
<enterprise-beans>
<session>
<ejb-name>CommandServiceBean</ejb-name>
- <jndi-name>ejb/CommandServiceBean</jndi-name>
- <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name>
+ <jndi-name>jbpm/CommandServiceBean</jndi-name>
+ <local-jndi-name>java:jbpm/CommandServiceBean</local-jndi-name>
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<jndi-name>java:JbpmDS</jndi-name>
@@ -26,7 +26,7 @@
</resource-ref>
<message-destination-ref>
<message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
- <jndi-name>queue/DLQ</jndi-name>
+ <jndi-name>jnp://${jboss.bind.address}:1100/queue/DLQ</jndi-name>
</message-destination-ref>
</message-driven>
@@ -38,7 +38,7 @@
</resource-ref>
<message-destination-ref>
<message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
- <jndi-name>queue/DLQ</jndi-name>
+ <jndi-name>jnp://${jboss.bind.address}:1100/queue/DLQ</jndi-name>
</message-destination-ref>
</message-driven>
@@ -52,12 +52,12 @@
<assembly-descriptor>
<message-destination>
<message-destination-name>JobQueue</message-destination-name>
- <jndi-name>queue/JbpmJobQueue</jndi-name>
+ <jndi-name>jnp://${jboss.bind.address}:1100/queue/JbpmJobQueue</jndi-name>
</message-destination>
<message-destination>
<message-destination-name>CommandQueue</message-destination-name>
- <jndi-name>queue/JbpmCommandQueue</jndi-name>
+ <jndi-name>jnp://${jboss.bind.address}:1100/queue/JbpmCommandQueue</jndi-name>
</message-destination>
</assembly-descriptor>
</jboss>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2010-08-07 06:42:22 UTC (rev 6548)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2010-08-07 07:52:48 UTC (rev 6549)
@@ -3,7 +3,6 @@
"http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
-
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<jndi-name>java:JbpmDS</jndi-name>
@@ -16,12 +15,11 @@
<ejb-local-ref>
<ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name>
- <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name>
+ <local-jndi-name>java:jbpm/CommandServiceBean</local-jndi-name>
</ejb-local-ref>
<message-destination-ref>
<message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
- <jndi-name>queue/JbpmJobQueue</jndi-name>
+ <jndi-name>jnp://${jboss.bind.address}:1100/queue/JbpmJobQueue</jndi-name>
</message-destination-ref>
-
-</jboss-web>
\ No newline at end of file
+</jboss-web>
More information about the jbpm-commits
mailing list