[jbpm-commits] JBoss JBPM SVN: r5961 - in jbpm4/trunk: modules/jpdl and 12 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 15 10:51:18 EST 2009


Author: koen.aers at jboss.com
Date: 2009-12-15 10:51:18 -0500 (Tue, 15 Dec 2009)
New Revision: 5961

Added:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java
Removed:
   jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/src/main/java/org/jbpm/test/enterprise/mdb/bean/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java
Modified:
   jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
   jbpm4/trunk/modules/jpdl/pom.xml
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
   jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
   jbpm4/trunk/qa/build.xml
Log:
Initial JMS activity and binding implementation

Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd	2009-12-15 15:51:18 UTC (rev 5961)
@@ -1248,7 +1248,7 @@
       </element>
     </choice>
   </group>
-
+  
   <complexType name="mailType">
     <sequence>
       <element name="description" minOccurs="0" maxOccurs="unbounded" type="string" />

Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/jpdl/pom.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -48,6 +48,12 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.jms</groupId>
+	  <artifactId>jms</artifactId>
+	  <version>1.1</version>
+      <scope>provided</scope>
+	</dependency>
   </dependencies>
   
   <build>

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -21,16 +21,12 @@
  */
 package org.jbpm.jpdl.internal.activity;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.List;
 
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.model.OpenExecution;
-import org.jbpm.pvm.internal.util.ReflectUtil;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;
-import org.jbpm.pvm.internal.wire.WireException;
 import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.wire.usercode.UserCodeReference;
@@ -49,6 +45,7 @@
   protected List<ArgDescriptor> argDescriptors = null;
 
   protected String variableName;
+  protected String jndiName;
   
   public void perform(OpenExecution execution) throws Exception {
     if (invocationReference==null) {
@@ -88,6 +85,9 @@
   public void setMethodName(String methodName) {
     this.methodName = methodName;
   }
+  public void setJndiName(String jndiName) {
+    this.jndiName = jndiName;
+  }
   public List<ArgDescriptor> getArgDescriptors() {
     return argDescriptors;
   }
@@ -100,4 +100,7 @@
   public String getVariableName() {
     return variableName;
   }
+  public String getJndiName() {
+    return jndiName;
+  }
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -58,6 +58,9 @@
 
     String variableName = XmlUtil.attribute(element, "var");
     javaActivity.setVariableName(variableName);
+    
+    String jndiName = XmlUtil.attribute(element, "jndi-name");
+    javaActivity.setJndiName(jndiName);
 
     return javaActivity;
   }

Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java	                        (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.activity;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.script.ScriptManager;
+
+
+/**
+ * @author Koen Aers
+ */
+public class JmsActivity extends JpdlAutomaticActivity {
+  
+  private static final Log log = Log.getLog(JmsActivity.class.getName());
+
+  private static final long serialVersionUID = 1L;
+  
+  protected String type = "text";
+  protected String text = "";
+  protected String connectionFactoryName = "";
+  protected String destinationName = "";
+
+  public void perform(OpenExecution execution) {
+	try {
+      Context context = new InitialContext();
+      if (context == null) return;
+      ConnectionFactory connectionFactory = getConnectionFactory(context);
+      if (connectionFactory == null) return;
+      Destination destination = getDestination(context);
+      if (destination instanceof Queue) {
+        handleQueueSend(connectionFactory, (Queue)destination);
+      }
+ 	} catch (JMSException e) {
+      log.warn("JMSException while performing JmsActivity", e);
+	} catch (NamingException e) {
+      log.warn("NamingException while performing JmsActivity", e);
+	}
+  }
+  
+  private String substituteVariables(String input) {
+	  return (String)ScriptManager.getScriptManager().evaluateExpression(input, null);
+  }
+  
+  private void handleQueueSend(ConnectionFactory connectionFactory, Queue queue) throws JMSException {
+    if (!(connectionFactory instanceof QueueConnectionFactory)) return;
+    QueueConnection queueConnection = ((QueueConnectionFactory)connectionFactory).createQueueConnection();
+    QueueSession queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+    queueConnection.start();
+    QueueSender queueSender = queueSession.createSender(queue);
+    TextMessage textMessage = queueSession.createTextMessage(substituteVariables(text));
+    queueSender.send(textMessage);
+    queueSender.close();
+    queueConnection.stop();
+    queueConnection.close();
+    queueSession.close();
+  }
+  
+  private Destination getDestination(Context context) throws NamingException {
+    Destination result = null;
+    Object object = context.lookup(destinationName);
+    if (object instanceof Destination) {
+      result = (Destination)object;
+    } else {
+      log.warn("Object bound to " + destinationName + " is no javax.jms.Destination");
+    }
+    return result;
+  }
+  
+  private ConnectionFactory getConnectionFactory(Context context) throws NamingException {
+    ConnectionFactory result = null;
+    Object object = context.lookup(connectionFactoryName);
+    if (object instanceof ConnectionFactory) {
+      result = (ConnectionFactory)object;
+    } else {
+      log.warn("Object bound to " + connectionFactoryName + " is no javax.jms.ConnectionFactory");
+    }
+    return result;
+  }
+
+  public void setType(String type) {
+	  this.type = type;
+  }
+  public void setText(String text) {
+    this.text = text;
+  }
+  public void setConnectionFactoryName(String connectionFactoryName) {
+    this.connectionFactoryName = connectionFactoryName;
+  }
+  public void setDestinationName(String destinationName) {
+    this.destinationName = destinationName;
+  }
+}


Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsActivity.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java	                        (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.activity;
+
+import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Koen Aers
+ */
+public class JmsBinding extends JpdlBinding {
+
+  public static final String TAG = "jms";
+
+  public JmsBinding() {
+    super(TAG);
+  }
+  
+  protected JmsBinding(String tagName) {
+    super(tagName);
+  }
+
+  public Object parseJpdl(Element element, Parse parse, JpdlParser parser) {
+    JmsActivity jmsActivity = createJmsActivity();
+    
+    Element textElement = XmlUtil.element(element, "text", false, parse);
+    if (textElement!=null) {
+      String text = XmlUtil.getContentText(textElement);
+      jmsActivity.setType("text");
+      jmsActivity.setText(text);
+    }
+    
+    String connectionFactoryName = XmlUtil.attribute(element, "connection-factory", true, parse);
+    jmsActivity.setConnectionFactoryName(connectionFactoryName);
+    
+    String destinationName = XmlUtil.attribute(element, "destination", true, parse);
+    jmsActivity.setDestinationName(destinationName);
+    
+    return jmsActivity;
+  }
+
+  protected JmsActivity createJmsActivity() {
+    return new JmsActivity();
+  }
+}


Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -21,6 +21,7 @@
   <activity binding="org.jbpm.jpdl.internal.activity.PassthroughBinding" />
   <activity binding="org.jbpm.jpdl.internal.activity.RulesBinding" />
   <activity binding="org.jbpm.jpdl.internal.activity.RulesDecisionBinding" />
+  <activity binding="org.jbpm.jpdl.internal.activity.JmsBinding" />
 
   <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" />
   <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" />

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -27,6 +27,11 @@
 	  <version>1.1</version>
       <scope>provided</scope>
 	</dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-pvm</artifactId>
+      <version>${version}</version>
+    </dependency>
   </dependencies>
 
   <build>

Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -1,16 +0,0 @@
-<project name="test" basedir=".">
-  <property name="deploy.dir" value="/Users/koen/Temp/jboss-5.0.0.GA/server/default/deploy/jbpm"/>
-  <target name="deploy-beans">
-  	<mkdir dir="${deploy.dir}"/>
-  	<jar destfile="jbpm-test-enterprise-ejb.jar" basedir="../test-enterprise-ejb/target/classes"/>
-  	<copy file="src/test/resources/jbpm-destinations-service.xml" todir="${deploy.dir}"/>
-  	<copy file="jbpm-test-enterprise-ejb.jar" todir="${deploy.dir}"/> 
-  </target>
-  <target name="deploy-webapp">
-  	<copy todir="stagedir/WEB-INF/classes">
-  	  <fileset dir="target/test-classes"/>
-  	</copy>
-  	<war destfile="jbpm-test-enterprise-suite.war" basedir="stagedir"/>
-  	<copy file="jbpm-test-enterprise-suite.war" todir="${deploy.dir}"/>
-  </target>
-</project>
\ No newline at end of file

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -34,6 +34,11 @@
       <artifactId>jbpm-test-enterprise-ejb</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-test-base</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>cactus</groupId>
       <artifactId>cactus.core</artifactId>
     </dependency>
@@ -42,6 +47,12 @@
       <artifactId>junit</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.jms</groupId>
+	  <artifactId>jms</artifactId>
+	  <version>1.1</version>
+      <scope>provided</scope>
+	</dependency>
   </dependencies>
 
   <profiles>

Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -1,20 +0,0 @@
-package org.jbpm.test.jms;
-
-import org.apache.cactus.ServletTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class JmsTest extends TestCase {
-
-	public static Test suite() {
-		ServletTestSuite servletTestSuite = new ServletTestSuite();
-		servletTestSuite.addTestSuite(JmsTest.class);
-		return servletTestSuite;
-	}
-	
-	public void testSanity() {
-		assertTrue(true);
-	}
-
-}

Copied: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java (from rev 5956, jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java)
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java	2009-12-15 15:51:18 UTC (rev 5961)
@@ -0,0 +1,69 @@
+package org.jbpm.test.jms.text;
+
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.apache.cactus.ServletTestSuite;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.test.JbpmTestCase;
+
+public class TextMessageTest extends JbpmTestCase {
+	
+  String deploymentId;
+
+  QueueConnection queueConnection = null;
+  QueueSession queueSession = null;
+  MessageConsumer messageConsumer = null;
+
+  public static Test suite() {
+    ServletTestSuite servletTestSuite = new ServletTestSuite();
+    servletTestSuite.addTestSuite(TextMessageTest.class);
+    return servletTestSuite;
+  }
+  	
+  protected void setUp() throws Exception {
+    super.setUp();  
+    setUpJms();
+    registerDeployment(repositoryService.createDeployment()
+        .addResourceFromClasspath("org/jbpm/test/jms/text/process.jpdl.xml")
+        .deploy());  
+  }
+  
+  protected void setUpJms() throws Exception {
+    Context context = new InitialContext();
+    QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory");
+    Queue queue = (Queue)context.lookup("queue/jbpm-test");
+    queueConnection = (QueueConnection)queueConnectionFactory.createConnection();
+    queueSession = queueConnection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    queueConnection.start();
+    messageConsumer = queueSession.createConsumer(queue);
+  }
+  
+  protected void tearDown() throws Exception {
+    tearDownJms();
+    super.tearDown();
+  }
+  
+  protected void tearDownJms() throws Exception {
+    queueConnection.stop();
+    queueSession.close();
+    queueConnection.close();
+  }
+	
+  public void testJmsText() throws Exception {
+    ProcessInstance processInstance = executionService.startProcessInstanceByKey("JMS_text", "JMS_Test_Message");
+    TextMessage textMessage = (TextMessage)messageConsumer.receive();
+    assertEquals("This is the body", textMessage.getText());
+    processInstance = executionService.signalExecutionById(processInstance.getId());
+    assertTrue(processInstance.isEnded());
+  }
+
+}


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/text/TextMessageTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -6,7 +6,7 @@
     <transition to="calculate" />
   </start>
 
-  <ejb name="calculate" 
+  <java name="calculate" 
         jndi="CalculatorBean"
         method="add"
         var="answer"

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -8,7 +8,7 @@
 
   <jms name="send message" 
         connectionFactory="ConnectionFactory"
-        destination="queue/test-jbpm"
+        destination="queue/jbpm-test"
         g="96,16,83,52">
     <message type="map">
       <entry name="x" value="foo"/>

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<process name="JMS object" xmlns="http://jbpm.org/4.3/jpdl">
+<process name="JMS object">
 
   <start g="20,20,48,48">
     <transition to="send message" />
@@ -8,13 +8,13 @@
 
   <jms name="send message" 
         connectionFactory="ConnectionFactory"
-        destination="queue/test-jbpm"
+        destination="queue/jbpm-test"
         g="96,16,83,52">
     <message type="object">
       ${object}
     </message>    
     <transition to="wait" />
-  </java>
+  </jms>
   
   <state name="wait" g="352,17,88,52"/>
 

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<process name="JMS text" xmlns="http://jbpm.org/4.3/jpdl">
+<process name="JMS_text">
 
   <start g="20,20,48,48">
     <transition to="send message" />
   </start>
 
   <jms name="send message" 
-        connectionFactory="ConnectionFactory"
-        destination="queue/test-jbpm"
+        connection-factory="ConnectionFactory"
+        destination="queue/jbpm-test"
         g="96,16,83,52">
-    <message type="text">
-      This is the body
-    </message>    
+    <text>This is the body</text>    
     <transition to="wait" />
-  </java>
+  </jms>
   
-  <state name="wait" g="352,17,88,52"/>
+  <state name="wait" g="352,17,88,52">
+    <transition to="end" />
+  </state>
+  
+  <end name="end"/>
 
 </process>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-12-15 15:51:09 UTC (rev 5960)
+++ jbpm4/trunk/qa/build.xml	2009-12-15 15:51:18 UTC (rev 5961)
@@ -216,8 +216,8 @@
   	<copy file="../modules/test-enterprise/test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar" 
   		todir="${jboss.home}/server/default/deploy/jbpm-test"/>
 
-    <!-- start jboss -->
-    <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" />
+    <!-- start jboss 
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> -->
 
   </target>
     



More information about the jbpm-commits mailing list