[jboss-svn-commits] JBL Code SVN: r18428 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2: product/lib and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 8 15:21:54 EST 2008
Author: kevin.conner at jboss.com
Date: 2008-02-08 15:21:54 -0500 (Fri, 08 Feb 2008)
New Revision: 18428
Added:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml
Removed:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml
Modified:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/Licenses.txt
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/h2.jar
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/jbpm-ds.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/StatisticsHelper.java
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml
Log:
Merged IR11 of ESB project
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-02-08 20:21:54 UTC (rev 18428)
@@ -754,6 +754,13 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="providerAdapterJNDI" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">
+ The JNDI location of an alternate provider adapter
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/Licenses.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/Licenses.txt 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/Licenses.txt 2008-02-08 20:21:54 UTC (rev 18428)
@@ -707,3 +707,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
+
+
+--- h2 database jar ----------------------------------------------------------
+
+Licensed under the H2 License, Version 1.0
+(http://h2database.com/html/license.html).
+Initial Developer: H2 Group
+
+------------------------------------------------------------------------------
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/lib/ext/h2.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -192,6 +192,10 @@
final Element activationConfigElement = YADOMUtil.addElement(listenerNode, JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
addPropertyElement(activationConfigElement, "destination", messageFilter.getDestName()) ;
+ if (jmsJcaProvider.isSetProviderAdapterJNDI())
+ {
+ addPropertyElement(activationConfigElement, "providerAdapterJNDI", jmsJcaProvider.getProviderAdapterJNDI()) ;
+ }
final int destType = messageFilter.getDestType().intValue() ;
if (destType == DestType.INT_QUEUE)
{
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -36,6 +36,7 @@
import org.jboss.soa.esb.services.jbpm.actions.JBpmCallback;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.Token;
/**
*
* Send messages to ESB services from jBPM applications, and leaves the node
@@ -146,7 +147,8 @@
if (globalProcessScope!=null) {
portReference.addExtension(Constants.PROCESS_SCOPE_ATTR, globalProcessScope.toString());
}
- final long tokenId = executionContext.getToken().getId();
+ final Token token = executionContext.getToken() ;
+ final long tokenId = token.getId();
portReference.addExtension(Constants.TOKEN_ID, String.valueOf(tokenId));
String nodeId = "";
if (executionContext.getNode()!=null) {
@@ -164,7 +166,7 @@
counter = 0l;
}
//Adding to the jBPM variableMap
- executionContext.setVariable(counterName, counter.toString());
+ executionContext.getContextInstance().setVariableLocally(counterName, counter.toString(), token);
//Adding same value to the message
portReference.addExtension(counterName, counter.toString());
return replyTo;
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -22,8 +22,16 @@
package org.jboss.soa.esb.services.jbpm.cmd;
import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.transaction.Synchronization;
+import javax.transaction.Transaction;
+
import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.TransactionStrategy;
+import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.command.SignalCommand;
import org.jbpm.context.exe.ContextInstance;
@@ -35,6 +43,7 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.instantiation.Delegation;
import org.jbpm.job.ExecuteActionJob;
+import org.jbpm.job.executor.JobExecutor;
import org.jbpm.msg.MessageService;
import org.jbpm.svc.Services;
@@ -58,13 +67,35 @@
* The base name of the ESB asynchronous signal context variable.
*/
private static final String ESB_ASYNC_SIGNAL_VARIABLE_NAME = "ESB_ASYNC_SIGNAL_VARIABLE_" ;
+ /**
+ * The name of the ESB asynchronous signal transition variable.
+ */
+ private static final String ESB_ASYNC_SIGNAL_TRANSITION_VARIABLE_NAME = ESB_ASYNC_SIGNAL_VARIABLE_NAME + "TRANSITION_" ;
+ /**
+ * The name of the ESB asynchronous signal actor variable.
+ */
+ private static final String ESB_ASYNC_SIGNAL_ACTOR_VARIABLE_NAME = ESB_ASYNC_SIGNAL_VARIABLE_NAME + "ACTOR_" ;
+ /**
+ * The name of the ESB asynchronous signal variable count.
+ */
+ private static final String ESB_ASYNC_SIGNAL_VARIABLE_COUNT = ESB_ASYNC_SIGNAL_VARIABLE_NAME + "COUNT_" ;
+ /**
+ * The name of the ESB asynchronous signal variable names.
+ */
+ private static final String ESB_ASYNC_SIGNAL_VARIABLE_NAMES = ESB_ASYNC_SIGNAL_VARIABLE_NAME + "NAME_" ;
+ /**
+ * Map of active synchronisations.
+ */
+ private static final ConcurrentHashMap<Transaction, Synchronization> SYNCHRONISATIONS = new ConcurrentHashMap<Transaction, Synchronization>() ;
/**
* Create an asynchronous signal job for the specified token and transition.
* @param token The token to signal.
* @param transitionName The transition to signal or null if the default transition is to be used.
+ * @param actor The actor to use.
+ * @param variables Any variables to update.
*/
- static void createSignalJob(final Token token, final String transitionName)
+ static void createSignalJob(final JbpmContext jbpmContext, final Token token, final String transitionName, final String actor, final Map variables)
{
final boolean isDebugEnabled = logger.isDebugEnabled() ;
final long tokenId = token.getId() ;
@@ -78,15 +109,26 @@
}
token.lock(ESB_ASYNC_SIGNAL_ACTION_NAME);
- final String transitionVariableName = ESB_ASYNC_SIGNAL_VARIABLE_NAME + tokenId ;
- if (transitionName != null)
+ final String transitionVariableName = ESB_ASYNC_SIGNAL_TRANSITION_VARIABLE_NAME ;
+ setVariable(contextInstance, token, transitionVariableName, transitionName) ;
+ final String actorVariableName = ESB_ASYNC_SIGNAL_ACTOR_VARIABLE_NAME ;
+ setVariable(contextInstance, token, actorVariableName, actor) ;
+
+ final int numVariables = (variables == null ? 0 : variables.size()) ;
+ setVariable(contextInstance, token, ESB_ASYNC_SIGNAL_VARIABLE_COUNT, Integer.toString(numVariables)) ;
+ if (numVariables > 0)
{
- contextInstance.setVariable(transitionVariableName, transitionName) ;
+ int count = 0 ;
+ final Iterator<Map.Entry> variableEntryIter = variables.entrySet().iterator() ;
+ do
+ {
+ final Map.Entry variableEntry = variableEntryIter.next() ;
+ final String name = variableEntry.getKey().toString() ;
+ setVariable(contextInstance, token, name, variableEntry.getValue()) ;
+ setVariable(contextInstance, token, ESB_ASYNC_SIGNAL_VARIABLE_NAMES + (count++), name) ;
+ } while (variableEntryIter.hasNext()) ;
}
- else
- {
- contextInstance.deleteVariable(transitionVariableName) ;
- }
+
final ExecuteActionJob signalJob = new ExecuteActionJob(token) ;
signalJob.setAction(getAsyncSignalAction(token)) ;
signalJob.setDueDate(new Date()) ;
@@ -94,7 +136,7 @@
if (isDebugEnabled)
{
- logger.debug("Sending signal task to message service for token id " + tokenId + " from process instance " + processInstanceId) ;
+ logger.debug("Sending " + (token.isSuspended() ? "suspended " : "") +"signal task to message service for token id " + tokenId + " from process instance " + processInstanceId) ;
}
final MessageService messageService = (MessageService)Services.getCurrentService(Services.SERVICENAME_MESSAGE, true) ;
messageService.send(signalJob) ;
@@ -102,9 +144,50 @@
{
logger.debug("Sent signal task to message service for token id " + tokenId + " from process instance " + processInstanceId) ;
}
+
+ final TransactionStrategy transactionStrategy = TransactionStrategy.getTransactionStrategy(true) ;
+ try
+ {
+ if (transactionStrategy.isActive())
+ {
+ final Transaction transaction = (Transaction)transactionStrategy.getTransaction() ;
+ if ((transaction != null) && !SYNCHRONISATIONS.containsKey(transaction))
+ {
+ final Synchronization synch = new JobNotifierSynchronisation(transaction, jbpmContext.getJbpmConfiguration().getJobExecutor()) ;
+ transaction.registerSynchronization(synch) ;
+ SYNCHRONISATIONS.put(transaction, synch) ;
+ }
+ }
+ }
+ catch (final Exception ex)
+ {
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Failed to register synchronization", ex) ;
+ }
+ }
}
/**
+ * Set the context instance variable.
+ * @param contextInstance The context instance.
+ * @param token The current token.
+ * @param name The variable name
+ * @param value The variable value
+ */
+ private static void setVariable(final ContextInstance contextInstance, final Token token, final String name, final Object value)
+ {
+ if (value != null)
+ {
+ contextInstance.setVariableLocally(name, value, token) ;
+ }
+ else
+ {
+ contextInstance.deleteVariable(name, token) ;
+ }
+ }
+
+ /**
* Locate the asynchronous signal action associated with the process instance.
* @param token The token to signal.
* @return The action used for asynchronous signalling.
@@ -181,9 +264,32 @@
}
final ProcessInstance processInstance = token.getProcessInstance() ;
final ContextInstance contextInstance = processInstance.getContextInstance() ;
- final String transitionName = (String)contextInstance.getVariable(ESB_ASYNC_SIGNAL_VARIABLE_NAME + tokenId) ;
- final SignalCommand signalCommand = new SignalCommand(tokenId, transitionName) ;
- signalCommand.execute(executionContext.getJbpmContext()) ;
+ final String transitionName = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_TRANSITION_VARIABLE_NAME, token) ;
+ final String actor = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_ACTOR_VARIABLE_NAME, token) ;
+ final JbpmContext jbpmContext = executionContext.getJbpmContext() ;
+ final String origActor = jbpmContext.getActorId() ;
+
+ final int variableCount = Integer.parseInt((String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_VARIABLE_COUNT, token)) ;
+ for(int count = 0 ; count < variableCount ; count++)
+ {
+ final String name = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_VARIABLE_NAMES + count, token) ;
+ final Object value = contextInstance.getVariableLocally(name, token) ;
+ contextInstance.setVariable(name, value) ;
+ }
+
+ try
+ {
+ if (actor != null)
+ {
+ jbpmContext.setActorId(actor) ;
+ }
+ final SignalCommand signalCommand = new SignalCommand(tokenId, transitionName) ;
+ signalCommand.execute(jbpmContext) ;
+ }
+ finally
+ {
+ jbpmContext.setActorId(origActor) ;
+ }
if (isDebugEnabled)
{
logger.debug("Signalled task " + tokenId + " from process instance " +
@@ -191,4 +297,51 @@
}
}
}
+
+ /**
+ * Synchronisation to notify the job executor.
+ * @author kevin
+ */
+ private static final class JobNotifierSynchronisation implements Synchronization
+ {
+ /**
+ * The associated transaction.
+ */
+ private Transaction transaction ;
+ /**
+ * The current job executor.
+ */
+ private final JobExecutor jobExecutor ;
+
+ /**
+ * Create the notifier synchronisation.
+ * @param transaction The current transaction.
+ * @param jobExecutor The current job executor.
+ */
+ public JobNotifierSynchronisation(final Transaction transaction, final JobExecutor jobExecutor)
+ {
+ this.transaction = transaction ;
+ this.jobExecutor = jobExecutor ;
+ }
+
+ /**
+ * The before completion notification.
+ */
+ public void beforeCompletion()
+ {
+ }
+
+ /**
+ * The after completion notification.
+ * @param status The status of the transaction.
+ */
+ public void afterCompletion(final int status)
+ {
+ SYNCHRONISATIONS.remove(transaction) ;
+ synchronized(jobExecutor)
+ {
+ jobExecutor.notify() ;
+ }
+ }
+ }
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -111,21 +111,14 @@
final ContextInstance contextInstance = instance.getContextInstance() ;
final long currentProcessNodeVersion = Long.parseLong(String.valueOf(
- contextInstance.getVariable(counterName)));
+ contextInstance.getVariableLocally(counterName, token)));
if (isDebugEnabled) logger.debug("ProcessNodeVersion=" + currentProcessNodeVersion);
if (processNodeVersion!=currentProcessNodeVersion) {
throw new CallbackException("The current processNodeVersion (id=" + currentProcessNodeVersion +
") is not the expected version (version=" + processNodeVersion + ").");
}
- if (variables != null && variables.size() > 0) {
- if (isDebugEnabled) {
- logger.debug("Initialising variables for token id " + tokenId + " from process instance " + processInstanceId) ;
- }
- contextInstance.addVariables(variables);
- }
-
- AsyncProcessSignal.createSignalJob(token, transitionName) ;
+ AsyncProcessSignal.createSignalJob(jbpmContext, token, transitionName, jbpmContext.getActorId(), variables) ;
} catch (CallbackException jbpmCe) {
logger.warn(jbpmCe.getMessage());
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -277,7 +277,7 @@
if (result instanceof ProcessInstance)
{
final ProcessInstance processInstance = (ProcessInstance)result ;
- AsyncProcessSignal.createSignalJob(processInstance.getRootToken(), transitionName) ;
+ AsyncProcessSignal.createSignalJob(jbpmContext, processInstance.getRootToken(), transitionName, getActorId(), null) ;
}
return result ;
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/jbpm-ds.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/jbpm-ds.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/jbpm/src/main/resources/jbpm-ds.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -6,7 +6,7 @@
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
<track-connection-by-tx/>
<transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <xa-datasource-property name="URL">jdbc:h2:${jboss.server.data.dir}${/}h2${/}jbpmDB</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:h2:${jboss.server.data.dir}${/}h2${/}jbpmDB;MVCC=TRUE</xa-datasource-property>
<xa-datasource-property name="User">sa</xa-datasource-property>
<xa-datasource-property name="Password"></xa-datasource-property>
<min-pool-size>5</min-pool-size>
@@ -17,6 +17,6 @@
</xa-datasource>
<mbean code="org.jboss.internal.soa.esb.dependencies.H2Database"
name="jboss:service=h2,database=jbpmDB">
- <attribute name="Database">jbpmDS</attribute>
+ <attribute name="Database">jbpmDB</attribute>
</mbean>
</datasources>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/StatisticsHelper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/StatisticsHelper.java 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/StatisticsHelper.java 2008-02-08 20:21:54 UTC (rev 18428)
@@ -212,7 +212,7 @@
*/
public static List getObjectNamesForServer(Session sess, String servername) {
String query = "SELECT DISTINCT jmxa.objectname "
- + "FROM JMXAttribute jmxa, JMXData jmxd "
+ + "FROM JMXATTRIBUTE jmxa, JMXDATA jmxd "
+ "WHERE jmxa.statid = jmxd.statid "
+ "AND jmxd.server = :servername";
SQLQuery sqlq = sess.createSQLQuery(query);
@@ -230,13 +230,13 @@
*/
public static List getAttributes(Session sess, String servername, String objectname) {
String query = "SELECT DISTINCT jmxa.* "
- + "FROM JMXAttribute jmxa, JMXData jmxd "
+ + "FROM JMXATTRIBUTE jmxa, JMXDATA jmxd "
+ "WHERE jmxa.statid = jmxd.statid "
+ "AND jmxd.server = :servername "
+ "AND jmxa.objectname = :objectname";
SQLQuery sqlq = sess.createSQLQuery(query);
sqlq.setString("objectname", objectname);
- sqlq.addEntity(JMXAttribute.class);
+ sqlq.addEntity("JMXATTRIBUTE", JMXAttribute.class);
sqlq.setString("servername", servername);
List result = sqlq.list();
return result;
@@ -252,7 +252,7 @@
*/
public static List getData(Session sess, String servername, Integer attributeId,
Integer timerange) {
- String query = "SELECT data.* from JMXData data "
+ String query = "SELECT data.* from JMXDATA data "
+ "WHERE data.statid = :attributeid "
+ "AND data.server = :servername ";
if (timerange.intValue() != -1) {
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/build.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -93,7 +93,7 @@
</target>
<target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
- <!--<ant dir="junit" target="ci-test" />-->
+ <ant dir="junit" target="ci-test" />
<ant dir="quickstarts" target="ci-test" />
</target>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync)
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/META-INF)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,4 +0,0 @@
-<jbossesb-deployment>
- <depends>jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel</depends>
- <depends>jboss.esb:test=JbpmServer</depends>
-</jbossesb-deployment>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/deployment.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+ <depends>jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel</depends>
+ <depends>jboss.esb:test=JbpmServer</depends>
+</jbossesb-deployment>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,21 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
- <providers>
- <jms-jca-provider name="JBossMQ" connection-factory="ConnectionFactory">
- <jms-bus busid="jbpm_channel">
- <jms-message-filter dest-type="QUEUE" dest-name="queue/jbpm_channel"/>
- </jms-bus>
- </jms-jca-provider>
- </providers>
-
- <services>
- <service category="TestJBPMAsyncESB" name="Echo" description="Echo service">
- <listeners>
- <jms-listener name="JBPM-ESBListener" busidref="jbpm_channel" maxThreads="1"/>
- </listeners>
- <actions>
- <action name="echoAction" class="org.jboss.soa.esb.server.jbpmAsync.EchoSuspendAction"/>
- </actions>
- </service>
- </services>
-</jbossesb>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/META-INF/jboss-esb.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,21 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+ <providers>
+ <jms-jca-provider name="JBossMQ" connection-factory="ConnectionFactory">
+ <jms-bus busid="jbpm_channel">
+ <jms-message-filter dest-type="QUEUE" dest-name="queue/jbpm_channel"/>
+ </jms-bus>
+ </jms-jca-provider>
+ </providers>
+
+ <services>
+ <service category="TestJBPMAsyncESB" name="Echo" description="Echo service">
+ <listeners>
+ <jms-listener name="JBPM-ESBListener" busidref="jbpm_channel" maxThreads="1"/>
+ </listeners>
+ <actions>
+ <action name="echoAction" class="org.jboss.soa.esb.server.jbpmAsync.EchoSuspendAction"/>
+ </actions>
+ </service>
+ </services>
+</jbossesb>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbm-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/esb-jbmq-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.qa.junit.destination:service=Queue,name=jbpm_channel">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition name="jBPMAsyncTest">
- <start-state name="start">
- <transition to="node1"/>
- </start-state>
-
- <node name="node1">
- <action name="sendToESB" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
- <esbCategoryName>TestJBPMAsyncESB</esbCategoryName>
- <esbServiceName>Echo</esbServiceName>
- </action>
- <transition to="node2"/>
- </node>
-
- <node name="node2">
- <action name="waitForNotification" class="org.jboss.soa.esb.server.jbpmAsync.JbpmAsyncActionHandler"/>
- <transition to="end"/>
- </node>
-
- <end-state name="end"/>
-</process-definition>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/jbpmAsyncTest.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="jBPMAsyncTest">
+ <start-state name="start">
+ <transition to="node1"/>
+ </start-state>
+
+ <node name="node1">
+ <action name="sendToESB" class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
+ <esbCategoryName>TestJBPMAsyncESB</esbCategoryName>
+ <esbServiceName>Echo</esbServiceName>
+ </action>
+ <transition to="node2"/>
+ </node>
+
+ <node name="node2">
+ <action name="waitForNotification" class="org.jboss.soa.esb.server.jbpmAsync.JbpmAsyncActionHandler"/>
+ <transition to="end"/>
+ </node>
+
+ <end-state name="end"/>
+</process-definition>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml 2008-02-08 20:12:53 UTC (rev 18427)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean name="jboss.esb:test=JbpmServer" code="org.jboss.soa.esb.server.jbpmAsync.JbpmServer"/>
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml (from rev 18427, labs/jbossesb/tags/JBESB_4_2_1_GA_CP_IR11/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/qa/junit/resources/server/jbpmAsync/test-jbpm-service.xml 2008-02-08 20:21:54 UTC (rev 18428)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean name="jboss.esb:test=JbpmServer" code="org.jboss.soa.esb.server.jbpmAsync.JbpmServer"/>
+</server>
More information about the jboss-svn-commits
mailing list