[jbpm-commits] JBoss JBPM SVN: r4189 - in jbpm4/branches/tbaeyens/modules: distro/src/main/resources/config-tool/jbpm/cfg and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Mar 7 08:16:05 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-03-07 08:16:05 -0500 (Sat, 07 Mar 2009)
New Revision: 4189
Added:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml
Removed:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.include.xml
Modified:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml
jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java
jbpm4/branches/tbaeyens/modules/examples/pom.xml
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-07 13:16:05 UTC (rev 4189)
@@ -63,7 +63,14 @@
</fileset>
</copy>
- <antcall target="internal.wire.bindings" />
+ <concat destfile="${config.files.dir}/jbpm.wire.bindings.xml">
+ <filelist dir=".">
+ <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" />
+ <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/>
+ <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
+ </filelist>
+ </concat>
+
<antcall target="internal.jpdl.hibernate.mapping.files" />
<antcall target="internal.identity.config.files" />
<antcall target="internal.jdk.logging" />
@@ -71,6 +78,32 @@
<echo>Created jbpm configuration files in ${config.files.dir}</echo>
</target>
+ <target name="create.remote.configuration"
+ depends="internal.prepare"
+ description="creates a jbpm.cfg.xml that connects to a remote jboss">
+ <delete>
+ <fileset dir="${config.files.dir}">
+ <include name="jbpm.*.xml" />
+ </fileset>
+ </delete>
+ <concat destfile="${config.files.dir}/jbpm.wire.bindings.xml">
+ <filelist dir=".">
+ <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" />
+ <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/>
+ <file name="jbpm/wire.bindings/enterprise.bindings.xml"/>
+ <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
+ </filelist>
+ </concat>
+ <concat destfile="${config.files.dir}/jbpm.cfg.xml">
+ <filelist dir="${resolved.dir}">
+ <file name="jbpm/cfg/part1.jbpm.cfg.xml" />
+ <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" />
+ <file name="jbpm/cfg/remote.command.service.xml" />
+ </filelist>
+ </concat>
+ <echo>Created remote jbpm configuration files in ${config.files.dir}</echo>
+ </target>
+
<target name="create.db.scripts"
depends="create.configuration.files"
description="create ddl scripts for creating the db">
@@ -104,24 +137,6 @@
quiet="yes" />
</target>
- <target name="create.remote.configuration"
- depends="internal.prepare"
- description="creates a jbpm.cfg.xml that connects to a remote jboss">
- <delete>
- <fileset dir="${config.files.dir}">
- <include name="jbpm.*.xml" />
- </fileset>
- </delete>
- <antcall target="internal.wire.bindings" />
- <concat destfile="${config.files.dir}/jbpm.cfg.xml">
- <filelist dir="${resolved.dir}">
- <file name="jbpm/cfg/part1.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" />
- <file name="jbpm/cfg/remote.command.service.xml" />
- </filelist>
- </concat>
- </target>
-
<target name="db.create"
depends="create.db.scripts, internal.load.hibernate.properties"
description="creates the db tables in the database">
@@ -163,16 +178,6 @@
<!-- internal targets -->
- <target name="internal.wire.bindings">
- <concat destfile="${config.files.dir}/jbpm.wire.bindings.xml">
- <filelist dir=".">
- <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" />
- <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/>
- <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
- </filelist>
- </concat>
- </target>
-
<target name="internal.load.hibernate.properties">
<copy file="${resolved.dir}/hibernate/jdbc/${database}.xml"
tofile="${tmp.dir}/hibernate.properties" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-07 13:16:05 UTC (rev 4189)
@@ -1,9 +1,10 @@
- <command-service initial-context-factory="org.jboss.naming.NamingContextFactory"
- provider-url="jnp://@jboss.bind.address@"
- url-pkg-prefixes="org.jboss.naming rg.jnp.interfaces">
+ <ejb-remote-command-service
+ initial-context-factory="org.jnp.interfaces.NamingContextFactory"
+ provider-url="jnp://@jboss.bind.address@"
+ url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces">
<retry-interceptor />
- </command-service>
+ </ejb-remote-command-service>
</process-engine-context>
</jbpm-configuration>
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml (from rev 4188, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.include.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml 2009-03-07 13:16:05 UTC (rev 4189)
@@ -0,0 +1,3 @@
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.exclude.xml
===================================================================
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.include.xml 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.include.xml 2009-03-07 13:16:05 UTC (rev 4189)
@@ -1,3 +0,0 @@
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />
Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-03-07 13:16:05 UTC (rev 4189)
@@ -29,12 +29,15 @@
import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
+import org.jbpm.internal.log.Log;
/**
* @author Tom Baeyens
*/
public class EjbRemoteCommandService implements CommandService {
+
+ private static final Log log = Log.getLog(EjbRemoteCommandService.class.getName());
protected String initialContextFactory;
protected String providerUrl;
@@ -57,7 +60,9 @@
env.put(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
try {
+ log.debug("creating initial context with env "+env);
InitialContext initialContext = new InitialContext(env);
+ log.debug("looking up "+jndiName);
RemoteCommandExecutorHome remoteCommandExecutorHome = (RemoteCommandExecutorHome) initialContext.lookup(jndiName);
RemoteCommandExecutor remoteCommandExecutor = remoteCommandExecutorHome.create();
Object result = remoteCommandExecutor.execute(command);
Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-03-07 13:16:05 UTC (rev 4189)
@@ -47,7 +47,7 @@
String jndiName = XmlUtil.attribute(element, "jndi-name", false, parse, "jbpm/CommandExecutor");
EjbRemoteCommandService ejbRemoteCommandService = new EjbRemoteCommandService(initialContextFactory, providerUrl, urlPkgPrefixes, jndiName);
- Descriptor descriptor = new ProvidedObjectDescriptor(ejbRemoteCommandService);
+ Descriptor descriptor = new ProvidedObjectDescriptor(ejbRemoteCommandService, true);
return descriptor;
}
Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-07 13:16:05 UTC (rev 4189)
@@ -106,6 +106,18 @@
<name>jboss.bind.address</name>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-enterprise</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-03-07 13:16:05 UTC (rev 4189)
@@ -344,7 +344,7 @@
parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" "+attributeName+"=\"...\" is required");
}
- return null;
+ return defaultValue;
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-03-07 11:05:49 UTC (rev 4188)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-03-07 13:16:05 UTC (rev 4189)
@@ -24,7 +24,6 @@
import java.util.List;
import org.jbpm.cmd.CommandService;
-import org.jbpm.enterprise.internal.ejb.EjbRemoteCommandService;
import org.jbpm.pvm.internal.svc.AsyncCommandService;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
import org.jbpm.pvm.internal.util.XmlUtil;
More information about the jbpm-commits
mailing list