[jboss-svn-commits] JBL Code SVN: r25281 - in labs/jbossesb/workspace/skeagh: examples/jms-bus and 50 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Feb 15 15:29:24 EST 2009
Author: tfennelly
Date: 2009-02-15 15:29:23 -0500 (Sun, 15 Feb 2009)
New Revision: 25281
Added:
labs/jbossesb/workspace/skeagh/examples/jms-bus/common-model/jbossesb-examples-jms-bus-cm.iml
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/debug.runner.args
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/debug.runner.args
labs/jbossesb/workspace/skeagh/examples/jms-routing/jms-client/jbossesb-examples-jms-routing-client.iml
labs/jbossesb/workspace/skeagh/examples/util/jbossesb-examples-util.iml
labs/jbossesb/workspace/skeagh/examples/util/jms-provider/jbossesb-examples-jms-provider.iml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtInboundRouter.java
labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/xsd/xprot/xprot.xsd-smooks.xml
Removed:
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/config.properties
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/run.bat
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/config.properties
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/run.bat
Modified:
labs/jbossesb/workspace/skeagh/examples/file-routing/src/main/resources/jboss-esb.xml
labs/jbossesb/workspace/skeagh/examples/jms-bus/README.html
labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/src/main/resources/jboss-esb.xml
labs/jbossesb/workspace/skeagh/examples/jms-bus/pom.xml
labs/jbossesb/workspace/skeagh/examples/jms-routing/esb/src/main/resources/jboss-esb.xml
labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/deployment-01.xml
labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/AbstractFileInboundRouter.java
labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java
labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/eval/PatternEvaluatorImpl.java
labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/lifecycle/FileLifecycleConfig.java
labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router.xml
labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/lifecycle/FileLifecycleConfigTest.java
labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/inbound/jms-inbound-router_01.xml
labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/outbound/jms-outbound-router.xml
labs/jbossesb/workspace/skeagh/runtime/pom.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/filter-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-03.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_03.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_04.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_05.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_03.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_04.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_05.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_06.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_07.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-no-service.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-service.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/businjection/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-03.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/01-inrouter-config.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/01-deployment.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-02.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-03.xml
Log:
Fixed jms-bus example. Experimented with inbound router config - removed from <service> and cleaned up <filterTo> on global inbound router config.
Modified: labs/jbossesb/workspace/skeagh/examples/file-routing/src/main/resources/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/file-routing/src/main/resources/jboss-esb.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/file-routing/src/main/resources/jboss-esb.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,14 +1,9 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <resources>
- <resource id="schedule1" class="org.jboss.esb.schedule.SimpleSchedule">
- <property name="frequency">5000</property>
- </resource>
- </resources>
-
- <services>
- <service serviceCategory="examples" serviceName="InboundRouter-File" serviceDescription="First Example" class="org.jboss.esb.examples.filerouter.MyTestService">
+ <routing>
+ <inRouters>
<inRouter name="fileRouter" class="org.jboss.esb.file.FileInboundRouter">
+ <filterTo serviceCategory="examples" serviceName="InboundRouter-File"/>
<property name="scheduleResourceId">schedule1</property>
<property name="fileSelectorPattern">${example.work.dir}/input/*.txt</property>
<property name="workingRenamePattern">${example.work.dir}/working/${name}-${timestamp}.working</property>
@@ -16,6 +11,17 @@
<property name="errrorRenamePattern">${example.work.dir}/error/${name}-${timestamp}.error</property>
<property name="payloadType">STRING</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <resources>
+ <resource id="schedule1" class="org.jboss.esb.schedule.SimpleSchedule">
+ <property name="frequency">5000</property>
+ </resource>
+ </resources>
+
+ <services>
+ <service serviceCategory="examples" serviceName="InboundRouter-File" serviceDescription="First Example" class="org.jboss.esb.examples.filerouter.MyTestService">
<outRouter name="fileOutboundRouter" class="org.jboss.esb.file.FileOutboundRouter">
<property name="fileNamePattern">${example.work.dir}/another-service-pickup-dir/${name}-${in_file_lastmod}.out</property>
</outRouter>
Modified: labs/jbossesb/workspace/skeagh/examples/jms-bus/README.html
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/README.html 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/README.html 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,7 +8,7 @@
This example illustrates how a JMS Bus can be used to exchange messages
between multiple ESB deployments.
-The message flow is as follows:
+The message flow is as follows:<br/>
<img src="images/message-flow.png" />
<p/>
Added: labs/jbossesb/workspace/skeagh/examples/jms-bus/common-model/jbossesb-examples-jms-bus-cm.iml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/common-model/jbossesb-examples-jms-bus-cm.iml (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/common-model/jbossesb-examples-jms-bus-cm.iml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/junit/junit/4.4/junit-4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="jbossesb-examples-felix-runner" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="jbossesb-commons" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Deleted: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/config.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/config.properties 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/config.properties 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,491 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.3 \
- ${jre-${java.specification.version}}
-
-m2.path=${user.home}/.m2/repository
-apache.m2.path=${m2.path}/org/apache
-jbossesb.m2.path=${m2.path}/jboss/jbossesb
-
-#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-#felix.cache.profile=foo
-felix.auto.start.1= \
- "file:${apache.m2.path}/felix/org.apache.felix.shell/1.0.2/org.apache.felix.shell-1.0.2.jar" \
- "file:${apache.m2.path}/felix/org.apache.felix.shell.tui/1.0.2/org.apache.felix.shell.tui-1.0.2.jar" \
- "file:${apache.m2.path}/felix/org.apache.felix.configadmin/1.0.4/org.apache.felix.configadmin-1.0.4.jar" \
- "file:${apache.m2.path}/activemq/activemq-core/5.2.0/activemq-core-5.2.0.jar" \
- "file:${apache.m2.path}/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar" \
- "file:${apache.m2.path}/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1.jar" \
- "file:${jbossesb.m2.path}/jbossesb-api/5.0-SNAPSHOT/jbossesb-api-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-runtime/5.0-SNAPSHOT/jbossesb-osgi-runtime-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-configloader/5.0-SNAPSHOT/jbossesb-osgi-configloader-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-routing-jms/5.0-SNAPSHOT/jbossesb-routing-jms-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-jmsbus/5.0-SNAPSHOT/jbossesb-osgi-jmsbus-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-routing-file/5.0-SNAPSHOT/jbossesb-routing-file-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-examples-jms-bus-esb1/5.0-SNAPSHOT/jbossesb-examples-jms-bus-esb1-5.0-SNAPSHOT.jar"
-
-felix.log.level=1
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-#felix.service.urlhandlers=false
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-osgi.shell.telnet=on
-obr.repository.url=http://felix.apache.org/obr/releases.xml
-
-
-#
-# Java platform package export properties.
-#
-jre-1.3=, \
- javax.accessibility; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4=, \
- javax.accessibility; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5=, \
- javax.accessibility; \
- javax.activity; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"
-
-jre-1.6=, \
- javax.accessibility; \
- javax.activation; \
- javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang.model; \
- javax.lang.model.element; \
- javax.lang.model.type; \
- javax.lang.model.util; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.script; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.tools; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.bind; \
- javax.xml.bind.annotation; \
- javax.xml.bind.annotation.adapters; \
- javax.xml.bind.attachment; \
- javax.xml.bind.helpers; \
- javax.xml.bind.util; \
- javax.xml.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version=\"1.6.0\"
Added: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/debug.runner.args
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/debug.runner.args (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/debug.runner.args 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1 @@
+--vmOptions=-agentlib:jdwp=transport=dt_socket,server=y,address=8787
\ No newline at end of file
Deleted: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/run.bat
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/run.bat 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/run.bat 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,15 +0,0 @@
- at echo off
-
-setlocal
-
-set JAVA_OPTS=-Dfelix.config.properties=file:./config.properties -Dorg.jboss.esb.properties.dir=../
-
-if "%1" == "-debug" (
- set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
-)
-
-set FELIX_JAR="%USERPROFILE%\.m2\repository\org\apache\felix\org.apache.felix.main\1.2.1\org.apache.felix.main-1.2.1.jar"
-
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -jar %FELIX_JAR%
-
-endlocal
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/src/main/resources/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/src/main/resources/jboss-esb.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb1/src/main/resources/jboss-esb.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,15 +6,23 @@
</resource>
</resources>
- <services>
- <service serviceCategory="ESB1" serviceName="Service1" serviceDescription="ESB1 Service1" class="org.jboss.esb.test.PrintlnService">
+ <routing>
+ <inRouters>
<inRouter name="fileRouter" class="org.jboss.esb.file.FileInboundRouter">
- <processors>
- <processor class="com.acme.transformers.StringToCustomer" />
- </processors>
+ <filterTo serviceCategory="ESB1" serviceName="Service1">
+ <processors>
+ <processor class="com.acme.transformers.StringToCustomer" />
+ </processors>
+ </filterTo>
+
<property name="scheduleResourceId">schedule1</property>
- <property name="fileSelectorPattern">./target/*.txt</property>
+ <property name="fileSelectorPattern">../target/*.txt</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="ESB1" serviceName="Service1" serviceDescription="ESB1 Service1" class="org.jboss.esb.test.PrintlnService">
<outRouter name="route-to-ESB2-Service" class="org.jboss.esb.invoke.ServiceRouter">
<property name="toCategory">ESB2</property>
<property name="toService">Service</property>
@@ -28,7 +36,7 @@
<processors>
<processor class="com.acme.transformers.CustomerToString" />
</processors>
- <property name="fileNamePattern">./target/service2-received/message.out</property>
+ <property name="fileNamePattern">../target/service2-received/${timestamp}.out</property>
</outRouter>
</service>
</services>
Deleted: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/config.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/config.properties 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/config.properties 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,491 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.3 \
- ${jre-${java.specification.version}}
-
-m2.path=${user.home}/.m2/repository
-apache.m2.path=${m2.path}/org/apache
-jbossesb.m2.path=${m2.path}/jboss/jbossesb
-
-#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-#felix.cache.profile=foo
-felix.auto.start.1= \
- "file:${apache.m2.path}/felix/org.apache.felix.shell/1.0.2/org.apache.felix.shell-1.0.2.jar" \
- "file:${apache.m2.path}/felix/org.apache.felix.shell.tui/1.0.2/org.apache.felix.shell.tui-1.0.2.jar" \
- "file:${apache.m2.path}/felix/org.apache.felix.configadmin/1.0.4/org.apache.felix.configadmin-1.0.4.jar" \
- "file:${apache.m2.path}/activemq/activemq-core/5.2.0/activemq-core-5.2.0.jar" \
- "file:${apache.m2.path}/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar" \
- "file:${apache.m2.path}/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1.jar" \
- "file:${jbossesb.m2.path}/jbossesb-api/5.0-SNAPSHOT/jbossesb-api-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-runtime/5.0-SNAPSHOT/jbossesb-osgi-runtime-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-configloader/5.0-SNAPSHOT/jbossesb-osgi-configloader-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-routing-jms/5.0-SNAPSHOT/jbossesb-routing-jms-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-osgi-jmsbus/5.0-SNAPSHOT/jbossesb-osgi-jmsbus-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-routing-file/5.0-SNAPSHOT/jbossesb-routing-file-5.0-SNAPSHOT.jar" \
- "file:${jbossesb.m2.path}/jbossesb-examples-jms-bus-esb2/5.0-SNAPSHOT/jbossesb-examples-jms-bus-esb2-5.0-SNAPSHOT.jar"
-
-felix.log.level=1
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-#felix.service.urlhandlers=false
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-osgi.shell.telnet=on
-obr.repository.url=http://felix.apache.org/obr/releases.xml
-
-
-#
-# Java platform package export properties.
-#
-jre-1.3=, \
- javax.accessibility; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4=, \
- javax.accessibility; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5=, \
- javax.accessibility; \
- javax.activity; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"
-
-jre-1.6=, \
- javax.accessibility; \
- javax.activation; \
- javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang.model; \
- javax.lang.model.element; \
- javax.lang.model.type; \
- javax.lang.model.util; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.script; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.tools; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.bind; \
- javax.xml.bind.annotation; \
- javax.xml.bind.annotation.adapters; \
- javax.xml.bind.attachment; \
- javax.xml.bind.helpers; \
- javax.xml.bind.util; \
- javax.xml.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version=\"1.6.0\"
Added: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/debug.runner.args
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/debug.runner.args (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/debug.runner.args 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1 @@
+--vmOptions=-agentlib:jdwp=transport=dt_socket,server=y,address=8787
\ No newline at end of file
Deleted: labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/run.bat
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/run.bat 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/esb2/run.bat 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,15 +0,0 @@
- at echo off
-
-setlocal
-
-set JAVA_OPTS=-Dfelix.config.properties=file:./config.properties -Dorg.jboss.esb.properties.dir=../
-
-if "%1" == "-debug" (
- set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
-)
-
-set FELIX_JAR="%USERPROFILE%\.m2\repository\org\apache\felix\org.apache.felix.main\1.2.1\org.apache.felix.main-1.2.1.jar"
-
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -jar %FELIX_JAR%
-
-endlocal
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/examples/jms-bus/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-bus/pom.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-bus/pom.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -69,7 +69,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbossesb/workspace/skeagh/examples/jms-routing/esb/src/main/resources/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-routing/esb/src/main/resources/jboss-esb.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/examples/jms-routing/esb/src/main/resources/jboss-esb.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,14 +1,21 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="examples" serviceName="helloworld" serviceDescription="First Example" class="org.jboss.esb.examples.jmsrouter.MyTestService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.jms.inbound.JmsInboundRouter">
<processors>
<processor class="org.jboss.esb.jms.processors.TextMessageExtractor"/>
</processors>
+ <filterTo serviceCategory="examples" serviceName="helloworld" />
<property name="jmsDestination">dynamicQueues/jbossesb.TestQueue</property>
<property name="java.naming.provider.url">tcp://localhost:61717</property>
<property name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="examples" serviceName="helloworld" serviceDescription="First Example" class="org.jboss.esb.examples.jmsrouter.MyTestService">
<outRouter name="outrouter" class="org.jboss.esb.jms.outbound.JmsOutboundRouter">
<property name="jmsDestination">dynamicQueues/jbossesb.TestOutQueue</property>
<property name="java.naming.provider.url">tcp://localhost:61717</property>
Added: labs/jbossesb/workspace/skeagh/examples/jms-routing/jms-client/jbossesb-examples-jms-routing-client.iml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/jms-routing/jms-client/jbossesb-examples-jms-routing-client.iml (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/jms-routing/jms-client/jbossesb-examples-jms-routing-client.iml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/javax/jms/jms/1.1/jms-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/derby/derby/10.1.1.0/derby-10.1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/activemq/activemq-core/4.1.2/activemq-core-4.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/activemq/activeio-core/3.0.1/activeio-core-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/junit/junit/4.4/junit-4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/mx4j/mx4j/3.0.2/mx4j-3.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0-M1/geronimo-j2ee-management_1.1_spec-1.0-M1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+</module>
+
Added: labs/jbossesb/workspace/skeagh/examples/util/jbossesb-examples-util.iml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/util/jbossesb-examples-util.iml (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/util/jbossesb-examples-util.iml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/junit/junit/4.4/junit-4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+</module>
+
Added: labs/jbossesb/workspace/skeagh/examples/util/jms-provider/jbossesb-examples-jms-provider.iml
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/util/jms-provider/jbossesb-examples-jms-provider.iml (rev 0)
+++ labs/jbossesb/workspace/skeagh/examples/util/jms-provider/jbossesb-examples-jms-provider.iml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="Spring" name="Spring">
+ <configuration>
+ <options>
+ <option name="enableValidation" value="false" />
+ <option name="reportErrorsAsWarnings" value="true" />
+ </options>
+ <customNs />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/deployment-01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/deployment-01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/deployment-01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,8 +1,18 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouterA" class="org.jboss.esb.TestInRouter">
+ <filter><to serviceCategory="Service" serviceName="A" /></filter>
+ </inRouter>
+ <inRouter name="inrouter1" class="org.jboss.esb.TestInRouter">
+ <filter><to serviceCategory="Service" serviceName="1" /></filter>
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouterA" class="org.jboss.esb.TestInRouter" />
<outRouter name="A_to_B_router" class="org.jboss.esb.invoke.ServiceRouter">
<property name="toCategory">Service</property>
<property name="toService">B</property>
@@ -16,7 +26,6 @@
</service>
<service serviceCategory="Service" serviceName="1" serviceDescription="1 Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter1" class="org.jboss.esb.TestInRouter" />
<outRouter name="1_to_2_router" class="org.jboss.esb.invoke.ServiceRouter">
<property name="toCategory">Service</property>
<property name="toService">2</property>
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/AbstractFileInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/AbstractFileInboundRouter.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/AbstractFileInboundRouter.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -134,7 +134,7 @@
/**
* The processed rename pattern for a successfully processed file.
*/
- @Property(defaultVal = "${name}.processed")
+ @Property(use = Property.Use.OPTIONAL)
private String processedRenamePattern;
/**
@@ -206,7 +206,10 @@
// Config the file lifecycle factory...
properties.setProperty(FileLifecycle.WORKING_RENAME_PATTERN, workingRenamePattern);
properties.setProperty(FileLifecycle.ERROR_RENAME_PATTERN, errorRenamePattern);
- properties.setProperty(FileLifecycle.PROCESSED_RENAME_PATTERN, processedRenamePattern);
+ if(processedRenamePattern != null)
+ {
+ properties.setProperty(FileLifecycle.PROCESSED_RENAME_PATTERN, processedRenamePattern);
+ }
fileLifecycleFactory = FileLifecycleFactory.Factory.newInstance(fileLifecycleFactoryName, properties);
if (logger.isDebugEnabled())
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -19,10 +19,16 @@
*/
package org.jboss.esb.file;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_LASTMOD;
import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_LENGTH;
import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_NAME;
import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_PATH;
+import org.jboss.esb.file.lifecycle.FileInfo;
+import org.jboss.esb.file.lifecycle.FileLifecycle;
+import org.jboss.esb.schedule.SchedulingException;
+import org.jboss.esb.util.FileUtil;
import java.io.File;
import java.io.FileInputStream;
@@ -31,13 +37,6 @@
import java.util.List;
import java.util.Map;
-import org.jboss.esb.api.context.InvocationContext;
-import org.jboss.esb.api.message.Message;
-import org.jboss.esb.file.lifecycle.FileInfo;
-import org.jboss.esb.file.lifecycle.FileLifecycle;
-import org.jboss.esb.schedule.SchedulingException;
-import org.jboss.esb.util.FileUtil;
-
/**
* Concrete implementation of {@link AbstractFileInboundRouter}.
*
@@ -97,10 +96,10 @@
*
* This method add the following:
* <lu>
- * <li>{@link #IN_FILE_PATH} - The absolute path to the file</li>
- * <li>{@link #IN_FILE_NAME} - The absolute path to the file</li>
- * <li>{@link #IN_FILE_LENGTH} - The lenght of the file</li>
- * <li>{@link #IN_FILE_LASTMOD} - The last modified date for the file</li>
+ * <li>{@link FileRoutingConstants#IN_FILE_PATH} - The absolute path to the file</li>
+ * <li>{@link FileRoutingConstants#IN_FILE_NAME} - The absolute path to the file</li>
+ * <li>{@link FileRoutingConstants#IN_FILE_LENGTH} - The lenght of the file</li>
+ * <li>{@link FileRoutingConstants#IN_FILE_LASTMOD} - The last modified date for the file</li>
* </lu>
*
* @param fileLifecycle The {@link FileLifecycle}.
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/eval/PatternEvaluatorImpl.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/eval/PatternEvaluatorImpl.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/eval/PatternEvaluatorImpl.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -20,18 +20,16 @@
*/
package org.jboss.esb.file.eval;
-import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_NAME;
-
-import java.io.IOException;
-import java.util.Map;
-
+import freemarker.template.TemplateException;
import org.apache.log4j.Logger;
import org.jboss.esb.api.context.InvocationContext;
import org.jboss.esb.api.message.Message;
+import static org.jboss.esb.file.FileRoutingConstants.IN_FILE_NAME;
import org.jboss.esb.util.FileUtil;
import org.jboss.esb.util.FreeMarkerTemplate;
-import freemarker.template.TemplateException;
+import java.io.IOException;
+import java.util.Map;
/**
* Concrete PatternEvaluator implementation.
@@ -81,6 +79,11 @@
*/
public final String evalFileName(final String filePattern, final Message message, final InvocationContext invocationContext)
{
+
+ //
+ // TODO: FIXME: The template should be created up front, cached and reused. All the relevant info (timestamp etc) should be injected into the template exec context and all done in one execution.
+ //
+
String fileName = replaceFileName(FileUtil.removePath(filePattern), invocationContext);
fileName = replaceTimestamp(fileName);
fileName = replaceUsingTemplate(fileName, message);
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/lifecycle/FileLifecycleConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/lifecycle/FileLifecycleConfig.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/lifecycle/FileLifecycleConfig.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -19,10 +19,10 @@
*/
package org.jboss.esb.file.lifecycle;
+import org.jboss.esb.api.exception.ConfigurationException;
+
import java.util.Properties;
-import org.jboss.esb.api.exception.ConfigurationException;
-
/**
* File Lifecycle Configuration.
*
@@ -55,7 +55,7 @@
{
workingRenamePattern = properties.getProperty(FileLifecycle.WORKING_RENAME_PATTERN, FileLifecycle.PREFIX_TOKEN + "." + FileLifecycle.SUFFIX_TOKEN + ".working");
errorRenamePattern = properties.getProperty(FileLifecycle.ERROR_RENAME_PATTERN, FileLifecycle.PREFIX_TOKEN + "." + FileLifecycle.SUFFIX_TOKEN + ".error");
- processedRenamePattern = properties.getProperty(FileLifecycle.PROCESSED_RENAME_PATTERN, FileLifecycle.PREFIX_TOKEN + "." + FileLifecycle.SUFFIX_TOKEN + ".processed");
+ processedRenamePattern = properties.getProperty(FileLifecycle.PROCESSED_RENAME_PATTERN);
}
/**
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -7,9 +7,10 @@
</resource>
</resources>
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService">
+ <routing>
+ <inRouters>
<inRouter name="stringType" class="org.jboss.esb.file.FileInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="scheduleResourceId">schedule1</property>
<property name="fileSelectorPattern">target\test-classes\*.txt</property>
<property name="workingRenamePattern">${name}-${timestamp}.${suffix}</property>
@@ -17,6 +18,7 @@
<property name="payloadType">STRING</property>
</inRouter>
<inRouter name="bytesType" class="org.jboss.esb.file.FileInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="scheduleResourceId">schedule1</property>
<property name="fileSelectorPattern">target\test-classes\*.txt</property>
<property name="workingRenamePattern">${name}-${timestamp}.${suffix}</property>
@@ -24,23 +26,28 @@
<property name="payloadType">BYTES</property>
</inRouter>
<inRouter name="streamType" class="org.jboss.esb.file.FileInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="scheduleResourceId">schedule1</property>
<property name="fileSelectorPattern">target\test-classes\*.txt</property>
<property name="workingRenamePattern">${name}-${timestamp}.${suffix}</property>
<property name="processedRenamePattern">${name}-${timestamp}-processed</property>
<property name="payloadType">STREAM</property>
</inRouter>
- </service>
-
- <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService">
+
<inRouter name="fileRouter2" class="org.jboss.esb.file.FileInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="scheduleResourceId">schedule1</property>
<property name="fileSelectorPattern">target\test-classes\*.txt</property>
<property name="workingRenamePattern">target/test/classes\${name}-${timestamp}.${suffix}</property>
<property name="processedRenamePattern">target/test-classes/processedDir/${name}.processed</property>
<property name="payloadType">STRING</property>
</inRouter>
- </service>
- </services>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService" />
+ <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService" />
+ </services>
</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/lifecycle/FileLifecycleConfigTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/lifecycle/FileLifecycleConfigTest.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/lifecycle/FileLifecycleConfigTest.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -20,15 +20,14 @@
*/
package org.jboss.esb.file.lifecycle;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Properties;
-
import org.jboss.esb.api.exception.ConfigurationException;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
+import java.util.Properties;
+
/**
* Test for {@link FileLifecycleConfig}.
*
@@ -76,13 +75,6 @@
}
@Test
- public void setConfigurationDefaultProcessedRenamePattern() throws ConfigurationException
- {
- fileLifecycleConfig.setConfiguration(configProperties);
- assertEquals(defaultRenamePrefix + ".processed", fileLifecycleConfig.getProcessedRenamePattern());
- }
-
- @Test
public void setConfigurationProcessedRenamePattern() throws ConfigurationException
{
final String pattern = "${name}-processed";
Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/inbound/jms-inbound-router_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/inbound/jms-inbound-router_01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/inbound/jms-inbound-router_01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,17 +1,22 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.jms.MyTestService">
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.jms.inbound.JmsInboundRouter">
<processors>
<processor class="org.jboss.esb.jms.processors.TextMessageExtractor"/>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="java.naming.provider.url">tcp://localhost:61717</property>
<property name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</property>
<property name="jmsDestination">jbossesb.TestQueue</property>
<property name="queue.jbossesb.TestQueue">jbossesb.TestQueue</property>
</inRouter>
- </service>
- </services>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.jms.MyTestService" />
+ </services>
</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/outbound/jms-outbound-router.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/outbound/jms-outbound-router.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/outbound/jms-outbound-router.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,9 +1,15 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.jms.TestInboundRouter">
+ <filterTo serviceCategory="serviceCat" serviceName="serviceName" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="serviceCat" serviceName="serviceName" serviceDescription="TestService" class="org.jboss.esb.jms.MyTestService">
- <inRouter name="inrouter" class="org.jboss.esb.jms.TestInboundRouter"/>
-
<outRouter name="outrouter" class="org.jboss.esb.jms.outbound.JmsOutboundRouter">
<processors>
<processor class="org.jboss.esb.jms.outbound.TestOutboundProcessor"/>
Modified: labs/jbossesb/workspace/skeagh/runtime/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/pom.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/pom.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-smooks-javabean</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>quartz</groupId>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -51,6 +51,12 @@
private String beanId;
/**
+ * Filter parent element name. The name can differ e.g. "filter", "filterTo" and more to come.
+ */
+ @ConfigParam
+ private String filterElementName;
+
+ /**
* Visit the start of the "evaluator" element.
* <p/>
* Creates the associated {@link FilterDecisionNode} and adds it as a child
@@ -65,7 +71,7 @@
FilterDecisionNode node = new FilterDecisionNode();
Stack<FilterDecisionNode> nodeStack;
- if (DomUtils.getName((Element) evaluatorElement.getParentNode()).equals("filter"))
+ if (DomUtils.getName((Element) evaluatorElement.getParentNode()).equals(filterElementName))
{
nodeStack = new Stack<FilterDecisionNode>();
executionContext.setAttribute(FilterDecisionTreeBuilder.class, nodeStack);
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd 2009-02-15 20:29:23 UTC (rev 25281)
@@ -87,7 +87,6 @@
</xs:annotation>
<xs:sequence>
<xs:element name="property" type="property" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="abstractInRouter" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="abstractOutRouter" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="serviceCategory" use="required" type="xs:string"/>
@@ -150,13 +149,13 @@
<xs:complexType name="inRouters">
<xs:sequence>
<xs:element ref="abstractInRouter" minOccurs="1" maxOccurs="unbounded"/>
- <xs:element name="filters" type="filters" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="abstractInRouter" abstract="true">
<xs:sequence>
<xs:element name="processors" type="processors" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="filterTo" type="infilter" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
</xs:complexType>
@@ -175,24 +174,20 @@
</xs:complexType>
</xs:element>
- <xs:complexType name="filters">
- <xs:sequence>
- <xs:element name="filter" type="infilter" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
<xs:complexType name="infilter">
- <xs:annotation>
- <xs:documentation xml:lang="en">Inbound router filter.</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="evaluator" type="evaluator" minOccurs="0" maxOccurs="1"/>
- <xs:element name="to" type="address" minOccurs="1" maxOccurs="1"/>
- <xs:element name="replyTo" type="address" minOccurs="0" maxOccurs="1"/>
- <xs:element name="faultTo" type="address" minOccurs="0" maxOccurs="1"/>
- <xs:element name="processors" type="processors" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="inRouter" use="required" type="xs:string"/>
+ <xs:complexContent>
+ <xs:extension base="address">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Inbound router filter.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="evaluator" type="evaluator" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="replyTo" type="address" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="faultTo" type="address" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="processors" type="processors" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<!--
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/filter-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/filter-smooks.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/filter-smooks.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -11,6 +11,7 @@
<resource-config selector="@selectorContext@/evaluator, at selectorContext@/**/evaluator">
<resource>org.jboss.esb.deploy.config.digest.FilterDecisionTreeBuilder</resource>
<param name="beanId">evaluator</param>
+ <param name="filterElementName">@filterElementName@</param>
</resource-config>
<import file="processors-smooks.xml">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -42,11 +42,11 @@
<!--
Filtering...
-->
- <jb:bindings beanId="inRouterFilters" class="java.util.ArrayList" createOnElement="inRouters/filters">
+ <jb:bindings beanId="inRouterFilters" class="java.util.ArrayList" createOnElement="inRouters">
<jb:wiring beanIdRef="inRouterFilter" />
</jb:bindings>
- <jb:bindings beanId="inRouterFilter" class="org.jboss.esb.deploy.config.InboundRouterFilterConfig" createOnElement="inRouters/filters/filter">
- <jb:value property="inRouterName" data="inRouters/filters/filter/@inRouter" />
+ <jb:bindings beanId="inRouterFilter" class="org.jboss.esb.deploy.config.InboundRouterFilterConfig" createOnElement="inRouters/**/filterTo">
+ <jb:expression property="inRouterName">inRouterConfig.name</jb:expression>
<jb:wiring property="filterConfig" beanIdRef="inFilterConfig" />
<jb:wiring property="to" beanIdRef="toSN" />
<jb:wiring property="replyTo" beanIdRef="replyToSN" />
@@ -54,7 +54,8 @@
</jb:bindings>
<import file="filter-smooks.xml">
<param name="beanId">inFilterConfig</param>
- <param name="selectorContext">inRouters/filters/filter</param>
+ <param name="selectorContext">inRouters/**/filterTo</param>
+ <param name="filterElementName">filterTo</param>
</import>
<!--
@@ -62,7 +63,7 @@
-->
<import file="servicename-smooks.xml">
<param name="beanId">toSN</param>
- <param name="selectorContext">filter/to</param>
+ <param name="selectorContext">filterTo</param>
</import>
<!--
@@ -70,7 +71,7 @@
-->
<import file="servicename-smooks.xml">
<param name="beanId">replyToSN</param>
- <param name="selectorContext">filter/replyTo</param>
+ <param name="selectorContext">filterTo/replyTo</param>
</import>
<!--
@@ -78,7 +79,7 @@
-->
<import file="servicename-smooks.xml">
<param name="beanId">faultToSN</param>
- <param name="selectorContext">filter/faultTo</param>
+ <param name="selectorContext">filterTo/faultTo</param>
</import>
</smooks-resource-list>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -54,6 +54,7 @@
<import file="filter-smooks.xml">
<param name="beanId">outFilterConfig</param>
<param name="selectorContext">outRouter/filter</param>
+ <param name="filterElementName">filter</param>
</import>
</smooks-resource-list>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -51,6 +51,20 @@
}
@Test
+ public void test_extendedConfig_InRouter() throws DeploymentException, IOException
+ {
+ DeploymentUnit deploymentUnit = digest("jbossesb-02.xml");
+
+ InboundRouterConfig routerConfig = deploymentUnit.getInboundRouter("inrouter1");
+
+ XProtInboundRouter router = (XProtInboundRouter) routerConfig.getRouter();
+ assertEquals("s", router.getXprotInAttribX());
+
+ List<InboundRouterFilterConfig> filters = routerConfig.getFilters();
+ assertEquals(1, filters.size());
+ }
+
+ @Test
public void test_resources_01() throws IOException, DeploymentException
{
DeploymentUnit configUnit = digest("jbossesb-resources_01.xml");
Added: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtInboundRouter.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtInboundRouter.java 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.deploy.config;
+
+import org.jboss.esb.api.routing.InboundRouter;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.annotations.Property;
+
+/**
+ * XProt InboundRouter.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class XProtInboundRouter implements InboundRouter
+{
+ /**
+ * xprotInAttribX config..
+ */
+ @Property
+ private String xprotInAttribX;
+
+ /**
+ * Set the {@link MessageDispatcher} for the router.
+ * <p/>
+ * Implementations use the dispatcher to dispatch messages to the
+ * consuming Service. The ESB runtime handles the details of delivering the
+ * message to the interested Service.
+ *
+ * @param dispatcher The {@link MessageDispatcher} instance.
+ */
+ public void setDispatcher(MessageDispatcher dispatcher)
+ {
+ }
+
+ /**
+ * Get xprotInAttribX.
+ * @return The xprotInAttribX value.
+ */
+ public String getXprotInAttribX()
+ {
+ return xprotInAttribX;
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtInboundRouter.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,12 +1,9 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd" xmlns:xprot="http://www.jboss.org/jbossesb/xsd/xprot/xprot.xsd">
<routing>
<inRouters>
- <xprot:xprotInRouter name="inrouter1" xprotInAttribX="s" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- </filters>
+ <xprot:xprotInRouter name="inrouter1" xprotInAttribX="s">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
+ </xprot:xprotInRouter>
</inRouters>
<outRouters serviceCategory="service-cat" serviceName="service-a">
<xprot:xprotOutRouter name="outrouter1" xprotOutAttribX="s"/>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-03.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-03.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-03.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -7,12 +7,9 @@
<routing>
<inRouters>
- <xprot:xprotInRouter name="inrouter1" xprotInAttribX="s" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- </filters>
+ <xprot:xprotInRouter name="inrouter1" xprotInAttribX="s">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
+ </xprot:xprotInRouter>
</inRouters>
<outRouters serviceCategory="service-cat" serviceName="service-a">
<xprot:xprotOutRouter name="outrouter1" xprotOutAttribX="s"/>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -16,6 +16,7 @@
<property name="someParam">3</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
@@ -27,6 +28,7 @@
<property name="someParam">5</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">2</property>
</inRouter>
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
@@ -35,28 +37,15 @@
<property name="someParam">6</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">4</property>
</inRouter>
<inRouter name="inrouter4" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">5</property>
<property name="myOtherParam">5</property>
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- <filter inRouter="inrouter2">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- <filter inRouter="inrouter3">
- <to serviceCategory="service-cat" serviceName="service-b" />
- </filter>
- <filter inRouter="inrouter4">
- <to serviceCategory="service-cat" serviceName="service-b" />
- </filter>
- </filters>
-
</inRouters>
<outRouters serviceCategory="service-cat" serviceName="service-a">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -16,6 +16,7 @@
<property name="someParam">3</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
@@ -27,6 +28,7 @@
<property name="someParam">5</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">2</property>
</inRouter>
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
@@ -35,27 +37,14 @@
<property name="someParam">6</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">4</property>
</inRouter>
<inRouter name="inrouter4" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">5</property>
<property name="myOtherParam">5</property>
</inRouter>
-
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- <filter inRouter="inrouter2">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- <filter inRouter="inrouter3">
- <to serviceCategory="service-cat" serviceName="service-b" />
- </filter>
- <filter inRouter="inrouter4">
- <to serviceCategory="service-cat" serviceName="service-b" />
- </filter>
- </filters>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -4,28 +4,25 @@
<!-- Test the replyTo and faultTo -->
<inRouters>
- <inRouter name="inrouter5" class="org.jboss.esb.deploy.config.MyInRouter" />
- <inRouter name="inrouter6" class="org.jboss.esb.deploy.config.MyInRouter" />
- <inRouter name="inrouter7" class="org.jboss.esb.deploy.config.MyInRouter" />
- <inRouter name="inrouter8" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter5">
- <to serviceCategory="service-cat" serviceName="service-c" />
+ <inRouter name="inrouter5" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-c">
<replyTo serviceCategory="cat" serviceName="s1"/>
- </filter>
- <filter inRouter="inrouter6">
- <to serviceCategory="service-cat" serviceName="service-c" />
+ </filterTo>
+ </inRouter>
+ <inRouter name="inrouter6" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-c">
<replyTo serviceCategory="cat" serviceName="s2"/>
- </filter>
- <filter inRouter="inrouter7">
- <to serviceCategory="service-cat" serviceName="service-c" />
+ </filterTo>
+ </inRouter>
+ <inRouter name="inrouter7" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-c">
<replyTo serviceCategory="cat" serviceName="s3"/>
<faultTo serviceCategory="cat" serviceName="s4"/>
- </filter>
- <filter inRouter="inrouter8">
- <to serviceCategory="service-cat" serviceName="service-c" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
+ <inRouter name="inrouter8" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-c" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -3,17 +3,15 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter1">
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="A" serviceName="AA">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload == "hello"</property>
</evaluator>
- <to serviceCategory="A" serviceName="AA" />
<replyTo serviceCategory="B" serviceName="BB" />
<faultTo serviceCategory="C" serviceName="CC" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -3,25 +3,22 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter1">
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="A" serviceName="AA">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload == "hello"</property>
</evaluator>
- <to serviceCategory="A" serviceName="AA" />
<replyTo serviceCategory="B" serviceName="BB" />
<faultTo serviceCategory="C" serviceName="CC" />
- </filter>
- <filter inRouter="inrouter1">
+ </filterTo>
+ <filterTo serviceCategory="1" serviceName="11">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload == "goodbye"</property>
</evaluator>
- <to serviceCategory="1" serviceName="11" />
<replyTo serviceCategory="2" serviceName="22" />
<faultTo serviceCategory="3" serviceName="33" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_03.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_03.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_03.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -3,18 +3,16 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter1">
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="A" serviceName="AA">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload.indexOf("hello") != -1</property>
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload.indexOf("world") != -1</property>
</evaluator>
</evaluator>
- <to serviceCategory="A" serviceName="AA" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_04.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_04.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_04.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -3,9 +3,8 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter1">
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="A" serviceName="AA">
<evaluator>
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload.indexOf("hello") != -1</property>
@@ -17,9 +16,8 @@
<property name="expression">true</property>
</evaluator>
</evaluator>
- <to serviceCategory="A" serviceName="AA" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_05.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_05.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_filters_05.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -3,9 +3,8 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
- <filters>
- <filter inRouter="inrouter1">
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="A" serviceName="AA">
<evaluator>
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression">message.payload.indexOf("hello") != -1</property>
@@ -17,9 +16,8 @@
<property name="expression">false</property>
</evaluator>
</evaluator>
- <to serviceCategory="A" serviceName="AA" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,11 +1,17 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter"/>
-
<outRouter name="outrouter1" class="org.jboss.esb.TestOutboundRouter">
<filter>
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_filters_02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,14 +2,18 @@
<services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter"/>
- </service>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.TestService" />
</services>
<routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
+ </inRouter>
+ </inRouters>
+
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.TestOutboundRouter">
<filter>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,14 +1,21 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_03.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_03.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_03.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,14 +1,21 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_04.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_04.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_04.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,14 +1,21 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
</service>
<service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_05.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_05.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_05.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,24 +1,32 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
- <services>
- <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
- </service>
- <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">2</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+ </service>
+ <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_06.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_06.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_06.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,50 +1,48 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
<services>
<service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+ </service>
+ <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
+ <outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
+ <processors>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <property name="someParam">3</property>
+ </processor>
+ </processors>
+ <property name="myparam">3</property>
+ </outRouter>
+ </service>
+ </services>
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
- </service>
- <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">2</property>
</inRouter>
- <outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
- <processors>
- <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
- <property name="someParam">3</property>
- </processor>
- </processors>
- <property name="myparam">3</property>
- </outRouter>
- </service>
- </services>
-
- <routing>
- <inRouters>
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">4</property>
</inRouter>
- <filters>
- <filter inRouter="inrouter3">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- </filters>
</inRouters>
</routing>
</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_07.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_07.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-services_07.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,53 +1,50 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
<services>
<service serviceCategory="service-cat" serviceName="service-a" serviceDescription="A Service" class="org.jboss.esb.deploy.config.MyTestService">
+ </service>
+ <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
+ <outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
+ <processors>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <property name="someParam">3</property>
+ </processor>
+ </processors>
+ <property name="myparam">3</property>
+ </outRouter>
+ </service>
+ </services>
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">1</property>
</inRouter>
- </service>
- <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="B Service" class="org.jboss.esb.deploy.config.MyTestService">
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-b" />
<property name="myparam">2</property>
</inRouter>
- <outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
- <processors>
- <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
- <property name="someParam">3</property>
- </processor>
- </processors>
- <property name="myparam">3</property>
- </outRouter>
- </service>
- </services>
-
- <routing>
- <inRouters>
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</processor>
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
<property name="myparam">4</property>
</inRouter>
-
- <filters>
- <filter inRouter="inrouter3">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- </filters>
-
</inRouters>
+
<outRouters serviceCategory="service-cat" serviceName="service-b">
<outRouter name="outrouter3" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -12,20 +12,15 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
+ <inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
+ </inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
<processor class="org.jboss.esb.deploy.config.MyMessageTransformer" />
</processors>
+ <filterTo serviceCategory="service-cat" serviceName="service-a" />
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- <filter inRouter="inrouter2">
- <to serviceCategory="service-cat" serviceName="service-a" />
- </filter>
- </filters>
</inRouters>
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-no-service.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-no-service.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-no-service.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,14 +2,10 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter" />
+ <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
+ </inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
-
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -12,12 +12,8 @@
<property name="newString">Goodbye World!</property>
</processor>
</processors>
+ <filterTo serviceCategory="hello" serviceName="hello" />
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -12,12 +12,8 @@
<property name="newString">Goodbye World!</property>
</processor>
</processors>
+ <filterTo serviceCategory="hello" serviceName="hello" />
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-service.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-service.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-service.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,12 +6,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
+ <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
+ </inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/businjection/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/businjection/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/businjection/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,8 +1,15 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
-
+
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
<!--
Route the message from A to B....
-->
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,12 +6,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
+ <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
+ </inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,12 +6,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="goodbye" />
- </filter>
- </filters>
+ <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="goodbye" />
+ </inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-03.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-03.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/deployment-03.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter" />
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="goodbye" />
- </filter>
- </filters>
+ <inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="goodbye" />
+ </inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/01-inrouter-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/01-inrouter-config.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/01-inrouter-config.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,12 +2,9 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,8 +1,15 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
<!--
Route the message from A to B....
-->
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,8 +1,15 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
-
+
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
<outRouter name="A_to_B_router" class="org.jboss.esb.invoke.ServiceRouter">
<property name="toCategory">Service</property>
<property name="toService">B</property>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,13 +2,11 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<replyTo serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,13 +6,11 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<replyTo serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,13 +2,11 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<replyTo serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,13 +2,11 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<faultTo serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,9 +1,16 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" mep="In-Out">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
</service>
</services>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,9 +1,16 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" mep="In-Out">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
</service>
</services>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -1,9 +1,16 @@
<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+ <routing>
+ <inRouters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
+ </inRouters>
+ </routing>
+
<services>
<service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" mep="In-Out">
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
<outRouter name="outrouter" class="org.jboss.esb.TestOutboundRouter" />
</service>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,25 +2,21 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
-
- <filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
<!-- Route v1 message to Service:A -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload.indexOf("<version>1</version>") != -1 --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
- </filter>
+ </filterTo>
<!-- Route v2 message to Service:B -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload.indexOf("<version>2</version>") != -1 --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,19 +2,13 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
-
- <filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
<!-- Route all messages to Service:A -->
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
+ <filterTo serviceCategory="Service" serviceName="A" />
<!-- Route all messages to Service:B -->
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ <filterTo serviceCategory="Service" serviceName="B" />
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,35 +8,30 @@
<property name="addToMessage">:added-by-inrouter-transformer</property>
</processor>
</processors>
- </inRouter>
- <filters>
<!-- Route v1 message to Service:A -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceA-router</property>
</processor>
</processors>
- </filter>
-
+ </filterTo>
<!-- Route v2 message to Service:B -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceB-router</property>
</processor>
</processors>
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -2,35 +2,31 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
-
- <filters>
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
<!-- Route v1 message to Service:A -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceA-router</property>
</processor>
</processors>
- </filter>
+ </filterTo>
<!-- Route v2 message to Service:B -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceB-router</property>
</processor>
</processors>
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,30 +8,25 @@
<property name="addToMessage">:added-by-inrouter-transformer</property>
</processor>
</processors>
- </inRouter>
- <filters>
<!-- Route v1 message to Service:A -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
- </filter>
-
+ </filterTo>
<!-- Route v2 message to Service:B -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceB-router</property>
</processor>
</processors>
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,30 +8,25 @@
<property name="addToMessage">:added-by-inrouter-transformer</property>
</processor>
</processors>
- </inRouter>
-
- <filters>
<!-- Route v1 message to Service:A -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceA-router</property>
</processor>
</processors>
- </filter>
+ </filterTo>
<!-- Route v2 message to Service:B -->
- <filter inRouter="inrouter">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,64 +8,56 @@
<property name="addToMessage">:added-by-inrouter1-transformer</property>
</processor>
</processors>
- </inRouter>
- <inRouter name="inrouter2" class="org.jboss.esb.TestInboundRouter">
- <processors>
- <processor class="org.jboss.esb.TestTransformer">
- <property name="addToMessage">:added-by-inrouter2-transformer</property>
- </processor>
- </processors>
- </inRouter>
-
- <filters>
- <filter inRouter="inrouter1">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter1-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceA-router</property>
</processor>
</processors>
- </filter>
+ </filterTo>
- <filter inRouter="inrouter1">
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter1-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceB-router</property>
</processor>
</processors>
- </filter>
-
- <filter inRouter="inrouter2">
+ </filterTo>
+ </inRouter>
+ <inRouter name="inrouter2" class="org.jboss.esb.TestInboundRouter">
+ <processors>
+ <processor class="org.jboss.esb.TestTransformer">
+ <property name="addToMessage">:added-by-inrouter2-transformer</property>
+ </processor>
+ </processors>
+ <filterTo serviceCategory="Service" serviceName="C">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter2-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="C" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceC-router</property>
</processor>
</processors>
- </filter>
+ </filterTo>
- <filter inRouter="inrouter2">
+ <filterTo serviceCategory="Service" serviceName="D">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter2-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="D" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceD-router</property>
</processor>
</processors>
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,64 +8,56 @@
<property name="addToMessage">:added-by-inrouter1-transformer</property>
</processor>
</processors>
- </inRouter>
- <inRouter name="inrouter2" class="org.jboss.esb.TestInboundRouter">
- <processors>
- <processor class="org.jboss.esb.TestTransformer">
- <property name="addToMessage">:added-by-inrouter2-transformer</property>
- </processor>
- </processors>
- </inRouter>
- <filters>
- <filter inRouter="inrouter1">
+ <filterTo serviceCategory="Service" serviceName="A">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter1-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="A" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceA-router</property>
</processor>
</processors>
- </filter>
-
- <filter inRouter="inrouter1">
+ </filterTo>
+ <filterTo serviceCategory="Service" serviceName="B">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter1-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="B" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceB-router</property>
</processor>
</processors>
- </filter>
+ </filterTo>
+ </inRouter>
+ <inRouter name="inrouter2" class="org.jboss.esb.TestInboundRouter">
+ <processors>
+ <processor class="org.jboss.esb.TestTransformer">
+ <property name="addToMessage">:added-by-inrouter2-transformer</property>
+ </processor>
+ </processors>
- <filter inRouter="inrouter2">
+ <filterTo serviceCategory="Service" serviceName="C">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "AAA:added-by-inrouter2-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="C" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceC-router</property>
</processor>
</processors>
- </filter>
-
- <filter inRouter="inrouter2">
+ </filterTo>
+ <filterTo serviceCategory="Service" serviceName="D">
<evaluator class="org.jboss.esb.filter.MVELEvaluator">
<property name="expression"><!-- message.payload == "BBB:added-by-inrouter2-transformer" --></property>
</evaluator>
- <to serviceCategory="Service" serviceName="D" />
<processors>
<processor class="org.jboss.esb.TestTransformer">
<property name="addToMessage">:added-by-serviceD-router</property>
</processor>
</processors>
- </filter>
- </filters>
+ </filterTo>
+ </inRouter>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/01-deployment.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/01-deployment.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -8,14 +8,10 @@
<routing>
<inRouters>
- <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
+ <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
+ <filterTo serviceCategory="Service" serviceName="A" />
+ </inRouter>
- <filters>
- <filter inRouter="inrouter">
- <to serviceCategory="Service" serviceName="A" />
- </filter>
- </filters>
-
</inRouters>
<outRouters serviceCategory="Service" serviceName="A">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-01.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-01.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -6,12 +6,18 @@
<property name="execCount">1</property>
</resource>
</resources>
-
- <services>
- <service serviceCategory="hello" serviceName="hello" serviceDescription="A Service" class="org.jboss.esb.dispatch.HelloWorldService">
+
+ <routing>
+ <inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.schedule.MockScheduledInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
<property name="scheduleResourceId">schedule1</property>
</inRouter>
+ </inRouters>
+ </routing>
+
+ <services>
+ <service serviceCategory="hello" serviceName="hello" serviceDescription="A Service" class="org.jboss.esb.dispatch.HelloWorldService">
</service>
</services>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-02.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-02.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-02.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -7,13 +7,9 @@
<routing>
<inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.schedule.MockScheduledInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
<property name="scheduleResourceId">schedule1</property>
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
</inRouters>
</routing>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-03.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-03.xml 2009-02-14 22:29:53 UTC (rev 25280)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/schedule-listener-03.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -11,13 +11,9 @@
<routing>
<inRouters>
<inRouter name="inrouter1" class="org.jboss.esb.schedule.MockScheduledInboundRouter">
+ <filterTo serviceCategory="hello" serviceName="hello" />
<property name="scheduleResourceId">schedule1</property>
</inRouter>
- <filters>
- <filter inRouter="inrouter1">
- <to serviceCategory="hello" serviceName="hello" />
- </filter>
- </filters>
</inRouters>
</routing>
</jbossesb>
\ No newline at end of file
Copied: labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/xsd/xprot/xprot.xsd-smooks.xml (from rev 25123, labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml)
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/xsd/xprot/xprot.xsd-smooks.xml (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/xsd/xprot/xprot.xsd-smooks.xml 2009-02-15 20:29:23 UTC (rev 25281)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
+ default-selector-namespace="http://www.jboss.org/jbossesb/xsd/xprot/xprot.xsd">
+
+ <jb:bindings beanId="inRouterConfig" class="org.jboss.esb.deploy.config.InboundRouterConfig" createOnElement="inRouters/xprotInRouter">
+ <jb:value property="name" data="xprotInRouter/@name" />
+ <jb:wiring property="serviceName" beanIdRef="serviceName" />
+ <jb:wiring property="router" beanIdRef="inRouter" />
+ <jb:wiring property="processors" beanIdRef="inrouter-processors" />
+ </jb:bindings>
+
+ <resource-config selector="inRouters/xprotInRouter">
+ <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <param name="beanId">inRouter</param> <!-- Wired in above. -->
+ <param name="className">org.jboss.esb.deploy.config.XProtInboundRouter</param>
+ </resource-config>
+
+ <resource-config selector="inRouters/xprotInRouter">
+ <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
+ <param name="beanId">inRouter</param> <!-- Created above. -->
+ <param name="property">xprotInAttribX</param>
+ <param name="valueAttrib">xprotInAttribX</param>
+ </resource-config>
+
+ <!--
+ xprotInRouter processors
+ -->
+ <import file="../smooks/processors-smooks.xml">
+ <param name="beanId">inrouter-processors</param>
+ <param name="selectorContext">inRouters/xprotInRouter/processors</param>
+ </import>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/xsd/xprot/xprot.xsd-smooks.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
More information about the jboss-svn-commits
mailing list