[jboss-svn-commits] JBL Code SVN: r23379 - in labs/jbossesb/workspace/skeagh/runtime/src/main: java/org/jboss/esb/deploy/config/digest and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 8 12:27:19 EDT 2008
Author: tfennelly
Date: 2008-10-08 12:27:18 -0400 (Wed, 08 Oct 2008)
New Revision: 23379
Added:
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml
Modified:
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
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/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml
Log:
removed some duplication in the configuration by using some paramaterized imports
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-10-08 13:52:53 UTC (rev 23378)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-10-08 16:27:18 UTC (rev 23379)
@@ -622,7 +622,6 @@
Map<ServiceName, ServiceConfig> serviceMap = aggregatedDeploymentUnit.getServices();
Map<ServiceName, List<OutboundRouterConfig>> outboundRouters = aggregatedDeploymentUnit.getOutboundRouters();
Set<ServiceName> serviceNames = outboundRouters.keySet();
- Set<Map.Entry<ServiceName, ServiceConfig>> services = serviceMap.entrySet();
for (ServiceName serviceName : serviceNames)
{
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java 2008-10-08 13:52:53 UTC (rev 23378)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java 2008-10-08 16:27:18 UTC (rev 23379)
@@ -281,14 +281,18 @@
try
{
Map<String, Object> outRoutersObjects = DigestUtil.digestElement(outRoutersElement);
- ServiceName serviceName = (ServiceName) outRoutersObjects.get("serviceName");
List<OutboundRouterConfig> outRouters = (List<OutboundRouterConfig>) outRoutersObjects.get("outRouters");
- if (outboundRouters.containsKey(serviceName))
+ if(!outRouters.isEmpty())
{
- throw new DeploymentException("An <outRouters> section is defined multiple times for Service '" + serviceName + "'. There should only be one.");
+ ServiceName serviceName = outRouters.get(0).getServiceName();
+
+ if (outboundRouters.containsKey(serviceName))
+ {
+ throw new DeploymentException("An <outRouters> section is defined multiple times for Service '" + serviceName + "'. There should only be one.");
+ }
+ outboundRouters.put(serviceName, outRouters);
}
- outboundRouters.put(serviceName, outRouters);
}
catch (IOException e)
{
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 2008-10-08 13:52:53 UTC (rev 23378)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml 2008-10-08 16:27:18 UTC (rev 23379)
@@ -34,28 +34,14 @@
<!--
inRouter processors
-->
+ <import file="processors-smooks.xml">
+ <param name="beanId">inrouter-processors</param>
+ <param name="selectorContext">inRouter/processors</param>
+ </import>
- <jb:bindings beanId="inrouter-processors" class="java.util.ArrayList" createOnElement="inRouter/processors">
- <jb:wiring beanIdRef="inrouter-processor" />
- </jb:bindings>
-
- <resource-config selector="inRouter/processors/processor">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
- <param name="beanId">inrouter-processor</param> <!-- Wired in above. -->
- <param name="classAttrib">class</param>
- <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
- </resource-config>
-
- <resource-config selector="inRouter/processors/processor/property">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">inrouter-processor</param> <!-- Created above. -->
- <param name="nameAttrib">name</param>
- </resource-config>
-
<!--
Filtering...
-->
-
<jb:bindings beanId="inRouterFilters" class="java.util.ArrayList" createOnElement="inRouters/filters">
<jb:wiring beanIdRef="inRouterFilter" />
</jb:bindings>
@@ -76,91 +62,33 @@
<!--
filter processors
-->
+ <import file="processors-smooks.xml">
+ <param name="beanId">filter-processors</param>
+ <param name="selectorContext">filter/processors</param>
+ </import>
- <jb:bindings beanId="filter-processors" class="java.util.ArrayList" createOnElement="filter/processors">
- <jb:wiring beanIdRef="filter-processor" />
- </jb:bindings>
-
- <resource-config selector="filter/processors/processor">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
- <param name="beanId">filter-processor</param> <!-- Wired in above. -->
- <param name="classAttrib">class</param>
- <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
- </resource-config>
-
- <resource-config selector="filter/processors/processor/property">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">filter-processor</param> <!-- Created above. -->
- <param name="nameAttrib">name</param>
- </resource-config>
-
<!--
Filter "to" Service Name ("serviceName")...
-->
- <resource-config selector="filter/to">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <import file="servicename-smooks.xml">
<param name="beanId">toSN</param>
- <param name="className">org.jboss.esb.service.ServiceName</param>
- </resource-config>
+ <param name="selectorContext">filter/to</param>
+ </import>
- <resource-config selector="filter/to">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">toSN</param> <!-- Created above. -->
- <param name="property">category</param>
- <param name="valueAttrib">serviceCategory</param>
- </resource-config>
-
- <resource-config selector="filter/to">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">toSN</param> <!-- Created above. -->
- <param name="property">name</param>
- <param name="valueAttrib">serviceName</param>
- </resource-config>
-
<!--
Filter "replyTo" Service Name ("serviceName")...
-->
- <resource-config selector="filter/replyTo">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <import file="servicename-smooks.xml">
<param name="beanId">replyToSN</param>
- <param name="className">org.jboss.esb.service.ServiceName</param>
- </resource-config>
+ <param name="selectorContext">filter/replyTo</param>
+ </import>
- <resource-config selector="filter/replyTo">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">replyToSN</param> <!-- Created above. -->
- <param name="property">category</param>
- <param name="valueAttrib">serviceCategory</param>
- </resource-config>
-
- <resource-config selector="filter/replyTo">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">replyToSN</param> <!-- Created above. -->
- <param name="property">name</param>
- <param name="valueAttrib">serviceName</param>
- </resource-config>
-
<!--
Filter "faultTo" Service Name ("serviceName")...
-->
- <resource-config selector="filter/faultTo">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <import file="servicename-smooks.xml">
<param name="beanId">faultToSN</param>
- <param name="className">org.jboss.esb.service.ServiceName</param>
- </resource-config>
+ <param name="selectorContext">filter/faultTo</param>
+ </import>
- <resource-config selector="filter/faultTo">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">faultToSN</param> <!-- Created above. -->
- <param name="property">category</param>
- <param name="valueAttrib">serviceCategory</param>
- </resource-config>
-
- <resource-config selector="filter/faultTo">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">faultToSN</param> <!-- Created above. -->
- <param name="property">name</param>
- <param name="valueAttrib">serviceName</param>
- </resource-config>
-
</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 2008-10-08 13:52:53 UTC (rev 23378)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml 2008-10-08 16:27:18 UTC (rev 23379)
@@ -4,31 +4,15 @@
default-selector-namespace="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
<!--
- Service Name ("serviceName")...
+ Service Name...
-->
-
- <resource-config selector="outRouters">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <import file="servicename-smooks.xml">
<param name="beanId">serviceName</param>
- <param name="className">org.jboss.esb.service.ServiceName</param>
- </resource-config>
+ <param name="selectorContext">outRouters</param>
+ </import>
- <resource-config selector="outRouters">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">serviceName</param> <!-- Created above. -->
- <param name="property">category</param>
- <param name="valueAttrib">serviceCategory</param>
- </resource-config>
-
- <resource-config selector="outRouters">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">serviceName</param> <!-- Created above. -->
- <param name="property">name</param>
- <param name="valueAttrib">serviceName</param>
- </resource-config>
-
<!--
- InRouters ("outRouters")...
+ Out Routers ("outRouters")...
-->
<jb:bindings beanId="outRouters" class="java.util.ArrayList" createOnElement="outRouters">
@@ -58,22 +42,9 @@
<!--
outRouter processors
-->
+ <import file="processors-smooks.xml">
+ <param name="beanId">outrouter-processors</param>
+ <param name="selectorContext">outRouter/processors</param>
+ </import>
- <jb:bindings beanId="outrouter-processors" class="java.util.ArrayList" createOnElement="outRouter/processors">
- <jb:wiring beanIdRef="outrouter-processor" />
- </jb:bindings>
-
- <resource-config selector="outRouter/processors/processor">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
- <param name="beanId">outrouter-processor</param> <!-- Wired in above. -->
- <param name="classAttrib">class</param>
- <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
- </resource-config>
-
- <resource-config selector="outRouter/processors/processor/property">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">outrouter-processor</param> <!-- Created above. -->
- <param name="nameAttrib">name</param>
- </resource-config>
-
</smooks-resource-list>
\ No newline at end of file
Copied: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml (from rev 23377, 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/processors-smooks.xml (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml 2008-10-08 16:27:18 UTC (rev 23379)
@@ -0,0 +1,24 @@
+<?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/jbossesb-5.0.xsd">
+
+
+ <jb:bindings beanId="@beanId@" class="java.util.ArrayList" createOnElement="@selectorContext@">
+ <jb:wiring beanIdRef="@beanId at -entry" />
+ </jb:bindings>
+
+ <resource-config selector="@selectorContext@/processor">
+ <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <param name="beanId">@beanId at -entry</param> <!-- Wired in above. -->
+ <param name="classAttrib">class</param>
+ <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
+ </resource-config>
+
+ <resource-config selector="@selectorContext@/processor/property">
+ <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
+ <param name="beanId">@beanId at -entry</param> <!-- Created above. -->
+ <param name="nameAttrib">name</param>
+ </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml 2008-10-08 16:27:18 UTC (rev 23379)
@@ -0,0 +1,27 @@
+<?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/jbossesb-5.0.xsd">
+
+
+ <resource-config selector="@selectorContext@">
+ <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <param name="beanId">@beanId@</param>
+ <param name="className">org.jboss.esb.service.ServiceName</param>
+ </resource-config>
+
+ <resource-config selector="@selectorContext@">
+ <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
+ <param name="beanId">@beanId@</param> <!-- Created above. -->
+ <param name="property">category</param>
+ <param name="valueAttrib">serviceCategory</param>
+ </resource-config>
+
+ <resource-config selector="@selectorContext@">
+ <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
+ <param name="beanId">@beanId@</param> <!-- Created above. -->
+ <param name="property">name</param>
+ <param name="valueAttrib">serviceName</param>
+ </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml 2008-10-08 13:52:53 UTC (rev 23378)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml 2008-10-08 16:27:18 UTC (rev 23379)
@@ -12,6 +12,14 @@
</jb:bindings>
<!--
+ Service Name ("serviceName")...
+ -->
+ <import file="servicename-smooks.xml">
+ <param name="beanId">serviceName</param>
+ <param name="selectorContext">service</param>
+ </import>
+
+ <!--
ServiceConfig...
-->
@@ -28,30 +36,6 @@
</jb:bindings>
<!--
- Service Name ("serviceName")...
- -->
-
- <resource-config selector="service">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
- <param name="beanId">serviceName</param>
- <param name="className">org.jboss.esb.service.ServiceName</param>
- </resource-config>
-
- <resource-config selector="service">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">serviceName</param> <!-- Created above. -->
- <param name="property">category</param>
- <param name="valueAttrib">serviceCategory</param>
- </resource-config>
-
- <resource-config selector="service">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">serviceName</param> <!-- Created above. -->
- <param name="property">name</param>
- <param name="valueAttrib">serviceName</param>
- </resource-config>
-
- <!--
Service instance...
-->
More information about the jboss-svn-commits
mailing list