[jboss-svn-commits] JBL Code SVN: r17868 - in labs/jbossesb/workspace/bramley/product: rosetta/src/org/jboss/soa/esb/listeners/config/mappers and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 15 11:19:53 EST 2008
Author: tfennelly
Date: 2008-01-15 11:19:52 -0500 (Tue, 15 Jan 2008)
New Revision: 17868
Added:
labs/jbossesb/workspace/bramley/product/rosetta/tests/resources/log4j.xml
Modified:
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml
labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/scheduled-listener-config-configtree.xml
labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-commons-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-edisax-0.2.1.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-core-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-csv-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-edi-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-misc-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-templating-1.0-SNAPSHOT.jar
Log:
Added the ManagedLifecycleContext. Should be done more formally. Updated Smooks 1.0 SNAPSHOT bins.
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java 2008-01-15 16:19:52 UTC (rev 17868)
@@ -104,6 +104,8 @@
listenerConfig.setAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG,
serviceName.getKeyProperty(ListenerTagNames.DEPLOYMENT_NAME_TAG));
}
+
+ ManagedLifecycleController controller = new ManagedLifecycleController();
List<ManagedLifecycle> instances = LifecycleUtil.getListeners(listenerConfig);
byte[] gatewayBytes = gatewayXml.toByteArray();
@@ -112,7 +114,7 @@
ConfigTree gatewayConfig = ConfigTree.fromInputStream(gatewayIs);
instances.addAll(LifecycleUtil.getGateways(gatewayConfig));
- ManagedLifecycleController controller = new ManagedLifecycleController(instances);
+ controller.setLifecycles(instances);
ScheduleProvider scheduleProvider = ScheduleProviderFactory.createInstance(instances, generator.getModel().getScheduleProvider());
controller.setScheduleProvider(scheduleProvider);
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2008-01-15 16:19:52 UTC (rev 17868)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
import org.jboss.soa.esb.listeners.config.xbeanmodel.PropertyDocument.Property;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument;
import org.w3c.dom.Element;
/**
@@ -58,7 +59,7 @@
try {
HashMap<String,String> hm = new HashMap<String,String>();
for(Action action : actions) {
- mapAction(listenerConfigTree, action);
+ mapAction(listenerConfigTree, action, listenerService);
if (hm.containsKey(action.getName())) {
throw new ConfigurationException("Tried to register a duplicate action name. Service "
+ listenerService.getName() + " already contains an action named "
@@ -76,12 +77,16 @@
/**
* Map an action instance onto the listener ConfigTree.
* @param listenerConfigTree The target listener ConfigTree.
- * @param action The action instance.
- */
- private static void mapAction(Element listenerConfigTree, Action action) {
+ * @param action The action instance.
+ * @param listenerService
+ */
+ private static void mapAction(Element listenerConfigTree, Action action, Service listenerService) {
Element actionConfigTree = YADOMUtil.addElement(listenerConfigTree, "action");
List<Property> properties = action.getPropertyList();
+ actionConfigTree.setAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG, listenerService.getCategory());
+ actionConfigTree.setAttribute(ListenerTagNames.SERVICE_NAME_TAG, listenerService.getName());
+ actionConfigTree.setAttribute(ListenerTagNames.ACTION_ELEMENT_TAG, action.getName());
actionConfigTree.setAttribute(ListenerTagNames.ACTION_ELEMENT_TAG, action.getName());
actionConfigTree.setAttribute(ListenerTagNames.ACTION_CLASS_TAG, action.getClass1());
actionConfigTree.setAttribute(ListenerTagNames.PROCESS_METHOD_TAG, action.getProcess());
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java 2008-01-15 16:19:52 UTC (rev 17868)
@@ -21,12 +21,14 @@
*/
package org.jboss.soa.esb.listeners.lifecycle;
-import java.util.Collection;
-
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.schedule.ScheduleProvider;
import org.jboss.soa.esb.schedule.SchedulingException;
-import org.apache.log4j.Logger;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* Controller class to manage the lifecycles of a set of managed instances.
*
@@ -34,14 +36,21 @@
*/
public class ManagedLifecycleController
{
- private static Logger logger = Logger.getLogger(ManagedLifecycleController.class);
+ private static Logger logger = Logger.getLogger(ManagedLifecycleController.class);
+ private static ThreadLocal<Map> lifecycleContext = new ThreadLocal<Map>();
+
/**
* The managed lifecycle instances.
*/
- private final ManagedLifecycle[] instances;
+ private ManagedLifecycle[] instances;
private ScheduleProvider scheduleProvider;
+ public ManagedLifecycleController()
+ {
+ lifecycleContext.set(new LinkedHashMap());
+ }
+
/**
* Construct the controller to manage the specified managed lifecycle instances.
*
@@ -49,14 +58,27 @@
*/
public ManagedLifecycleController(final Collection<ManagedLifecycle> lifecycles)
{
- if(lifecycles == null) {
- instances = new ManagedLifecycle[0];
- } else {
- instances = lifecycles.toArray(new ManagedLifecycle[lifecycles.size()]);
- }
+ this();
+ setLifecycles(lifecycles);
}
- /**
+ public void setLifecycles(Collection<ManagedLifecycle> lifecycles) {
+ if(lifecycles == null) {
+ instances = new ManagedLifecycle[0];
+ } else {
+ instances = lifecycles.toArray(new ManagedLifecycle[lifecycles.size()]);
+ }
+ }
+
+ public static Map getLifecycleContext() {
+ Map context = lifecycleContext.get();
+ if(context == null) {
+ throw new RuntimeException("Invalid call to getLifecycleContext(). Can only be called in the context of a ManagedLifecycleController initialization.");
+ }
+ return context;
+ }
+
+ /**
* Start the lifecyles for the managed instances.
* <p/>
* The managed instances will be left in the destroyed state if an error occurs.
@@ -66,15 +88,19 @@
public void start()
throws ManagedLifecycleException
{
- initialiseInstances();
- startInstances();
- try {
- if(scheduleProvider != null) {
- scheduleProvider.start();
- }
- } catch (SchedulingException e) {
- stopAndDestroy(false);
- throw new ManagedLifecycleException("Failed to start schedule provider.", e);
+ try {
+ initialiseInstances();
+ startInstances();
+ try {
+ if(scheduleProvider != null) {
+ scheduleProvider.start();
+ }
+ } catch (SchedulingException e) {
+ stopAndDestroy(false);
+ throw new ManagedLifecycleException("Failed to start schedule provider.", e);
+ }
+ } finally {
+ lifecycleContext.remove();
}
}
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2008-01-15 16:19:52 UTC (rev 17868)
@@ -22,11 +22,11 @@
package org.jboss.soa.esb.listeners.message;
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.internal.soa.esb.couriers.AsynchronousDeliverOnlyCourier;
import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.Service;
import org.jboss.soa.esb.actions.ActionLifecycle;
import org.jboss.soa.esb.actions.ActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingFaultException;
@@ -40,13 +40,16 @@
import org.jboss.soa.esb.couriers.CourierUtil;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
import org.jboss.soa.esb.listeners.message.errors.Factory;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.util.ClassUtil;
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier;
-import org.jboss.internal.soa.esb.couriers.AsynchronousDeliverOnlyCourier;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* Action Processing Pipeline. <p/> Runs a list of action classes on a message
*
@@ -73,39 +76,54 @@
*/
private final AtomicBoolean active = new AtomicBoolean(false);
- /**
+ private boolean isInitialised = false;
+
+ /**
*
*/
private ServiceMessageCounter serviceMessageCounter;
-
- /**
+ private static final String CONTEXT_PIPELINES_KEY = ActionProcessingPipeline.class.getName() + "#PIPELINES";
+
+ public static ActionProcessingPipeline getInstance(final ConfigTree config) throws ConfigurationException {
+ ConfigTree[] actionList = getActionConfigs(config);
+ String serviceCat = actionList[0].getRequiredAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
+ String serviceName = actionList[0].getRequiredAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+ Service service = new Service(serviceCat, serviceName);
+ Map<Service, ActionProcessingPipeline> contextPipelines = getContextPipelines();
+ ActionProcessingPipeline pipeline;
+
+ if(contextPipelines != null) {
+ pipeline = contextPipelines.get(service);
+ if(pipeline == null) {
+ // Need to create the pipeline for this service (and cache it in the lifecycle context) ....
+ pipeline = new ActionProcessingPipeline(config);
+ contextPipelines.put(service, pipeline);
+ } else {
+ System.out.println("Pipeline for '" + service + "' already created, Returning cached pipeline...");
+ }
+ } else {
+ pipeline = new ActionProcessingPipeline(config);
+ }
+
+ return pipeline;
+ }
+
+ /**
* public constructor
- *
+ *
* @param config
* The pipeline configuration.
- */
+ */
public ActionProcessingPipeline(final ConfigTree config)
throws ConfigurationException
{
- if (config == null)
- {
- throw new IllegalArgumentException(
- "Configuration needed for action classes");
- }
+ final ConfigTree[] actionList = getActionConfigs(config);
- final ConfigTree[] actionList = config
- .getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);
-
- if ((actionList == null) || (actionList.length == 0))
- {
- throw new ConfigurationException("No actions in list");
- }
-
final ArrayList<ActionPipelineProcessor> processorList = new ArrayList<ActionPipelineProcessor>();
serviceMessageCounter = new ServiceMessageCounter(config);
serviceMessageCounter.registerMBean();
-
+
for (final ConfigTree actionConfig : actionList)
{
final String actionClassTag = actionConfig
@@ -194,7 +212,36 @@
.toArray(new ActionPipelineProcessor[processorList.size()]);
}
- /**
+ private static Map<Service, ActionProcessingPipeline> getContextPipelines() {
+ Map lifecycleContext = ManagedLifecycleController.getLifecycleContext();
+
+ if(lifecycleContext != null) {
+ Map<Service, ActionProcessingPipeline> servicePipelines = (Map<Service, ActionProcessingPipeline>) lifecycleContext.get(CONTEXT_PIPELINES_KEY);
+
+ if(servicePipelines == null) {
+ servicePipelines = new LinkedHashMap<Service, ActionProcessingPipeline>();
+ lifecycleContext.put(CONTEXT_PIPELINES_KEY, servicePipelines);
+ }
+
+ return servicePipelines;
+ } else {
+ return null;
+ }
+ }
+
+ private static ConfigTree[] getActionConfigs(ConfigTree config) throws ConfigurationException {
+ AssertArgument.isNotNull(config, "config");
+
+ final ConfigTree[] actionList = config.getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);
+ if ((actionList == null) || (actionList.length == 0))
+ {
+ throw new ConfigurationException("No actions in list");
+ }
+
+ return actionList;
+ }
+
+ /**
* Handle the initialisation of the pipeline
*
* @throws ConfigurationException
@@ -202,7 +249,12 @@
*/
public void initialise() throws ConfigurationException
{
- final int numLifecycles = processors.length;
+ if(isInitialised) {
+ return;
+ }
+ isInitialised = true;
+
+ final int numLifecycles = processors.length;
for (int count = 0; count < numLifecycles; count++)
{
final ActionLifecycle lifecycle = processors[count];
@@ -226,6 +278,11 @@
*/
public void destroy()
{
+ if(!isInitialised) {
+ return;
+ }
+ isInitialised = false;
+
active.set(false);
handleDestroy(processors.length - 1);
}
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-01-15 16:19:52 UTC (rev 17868)
@@ -168,7 +168,7 @@
{
final ActionProcessingPipeline pipeline ;
try
- {
+ {
pipeline = new ActionProcessingPipeline(_config) ;
pipeline.initialise() ;
}
@@ -271,6 +271,12 @@
// If the courier is non-processing, then this
// listener instance will execute the pipeline...
waitForEventAndProcess(100) ; // TODO magic number
+ } else {
+ try {
+ Thread.sleep(750);
+ } catch (InterruptedException e) {
+ // ignore
+ }
}
}
}
Added: labs/jbossesb/workspace/bramley/product/rosetta/tests/resources/log4j.xml
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/tests/resources/log4j.xml (rev 0)
+++ labs/jbossesb/workspace/bramley/product/rosetta/tests/resources/log4j.xml 2008-01-15 16:19:52 UTC (rev 17868)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+
+ <category name="org.milyn">
+ <priority value="info"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
+
Property changes on: labs/jbossesb/workspace/bramley/product/rosetta/tests/resources/log4j.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2008-01-15 16:19:52 UTC (rev 17868)
@@ -1,41 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- NOTE: DO NOT MODIFY
- This file was auto-generated.
--->
-<jbossesb-listeners parameterReloadSecs="180">
-<Bank-Listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
-<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/>
-<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">
- This is some complex..
- <!-- property -->
- value.
- <xxxx>
- boooo
- <yyyy/>
- </xxxx>
- Some CDATA data...
- </action>
-</Bank-Listener>
-<Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" my-generic-listener="my-generic-listener#someattribvalue" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
-<EPR my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/>
-<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue">
- This is some complex..
- <!-- property -->
- value.
- <xxxx>
- boooo
- <yyyy/>
- </xxxx>
- Some CDATA data...
- </action>
-</Bank-Listener-Generic>
-<test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" schedule-frequency="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest">
-<EPR URL="ftp://joe:secret@localhost:21/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/>
-<action action="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
-</test-ftp-listener>
-<test-sql-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest">
-<EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/>
-<action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
-</test-sql-listener>
-</jbossesb-listeners>
+<?xml version="1.0" encoding="UTF-8"?><!-- NOTE: DO NOT MODIFY This file was auto-generated.--><jbossesb-listeners parameterReloadSecs="180"><Bank-Listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue" service-category="Bank" service-name="Reconciliation"> This is some complex.. <!-- property --> value. <xxxx> boooo <yyyy/> </xxxx> Some CDATA data... </action></Bank-Listener><Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" my-g!
eneric-listener="my-generic-listener#someattribvalue" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation"><EPR my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue" service-category="Bank" service-name="Reconciliation"> This is some complex.. <!-- property --> value. <xxxx> boooo <yyyy/> </xxxx> Some CDATA data... </action></Bank-Listener-Generic><test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" schedule-frequency="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest"><EPR URL="ftp://joe:secret@localhost:21/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/><action ac!
tion="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBase
dRouter" service-category="Test2" service-name="FTPTest"/></test-ftp-listener><test-sql-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest"><EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/><action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" service-category="Test3" service-name="SQLTest"/></test-sql-listener></jbossesb-listeners>
\ No newline at end of file
Modified: labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/scheduled-listener-config-configtree.xml
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/scheduled-listener-config-configtree.xml 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/listeners/scheduled-listener-config-configtree.xml 2008-01-15 16:19:52 UTC (rev 17868)
@@ -1,3 +1,3 @@
<simple-schedule-listener event-processor="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" listenerClass="org.jboss.soa.esb.listeners.ScheduleListener" my-prop="1" scheduleidref="1-sec-trigger">
-<action action="action" class="org.jboss.soa.esb.mock.MockAction"/>
+<action action="action" class="org.jboss.soa.esb.mock.MockAction" service-category="ServiceCat" service-name="ServiceName"/>
</simple-schedule-listener>
\ No newline at end of file
Modified: labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml 2008-01-15 15:53:14 UTC (rev 17867)
+++ labs/jbossesb/workspace/bramley/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml 2008-01-15 16:19:52 UTC (rev 17868)
@@ -1,3 +1,3 @@
<simple-schedule-listener event-processor="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" listenerClass="org.jboss.soa.esb.listeners.ScheduleListener" scheduleidref="1-sec-trigger">
-<action action="action" class="org.jboss.soa.esb.mock.MockAction"/>
+<action action="action" class="org.jboss.soa.esb.mock.MockAction" service-category="ServiceCat" service-name="ServiceName-01"/>
</simple-schedule-listener>
\ No newline at end of file
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-commons-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-edisax-0.2.1.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-core-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-csv-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-edi-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-misc-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-templating-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list