You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/13 13:50:56 UTC
svn commit: r377368 - in /incubator/servicemix/trunk/servicemix-core/src:
main/java/org/apache/servicemix/jbi/deployment/
main/java/org/apache/servicemix/jbi/deployment/impl/
main/java/org/apache/servicemix/jbi/framework/
test/java/org/apache/servicemi...
Author: gnodet
Date: Mon Feb 13 04:50:52 2006
New Revision: 377368
URL: http://svn.apache.org/viewcvs?rev=377368&view=rev
Log:
Fix jbi descriptor parsing problems when multiple connections defined
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/deployment/serviceAssembly.xml
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java Mon Feb 13 04:50:52 2006
@@ -22,11 +22,11 @@
public class Connections {
private Connection[] connections;
- public Connection[] getConnection() {
+ public Connection[] getConnections() {
return connections;
}
- public void setConnection(Connection[] connections) {
+ public void setConnections(Connection[] connections) {
this.connections = connections;
}
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java Mon Feb 13 04:50:52 2006
@@ -56,11 +56,10 @@
moveToProperyListElement(bean, "path-element", "pathElements");
moveToProperyListElement(bean, "service-unit", "serviceUnits");
+ moveToProperyListElement(bean, "connection", "connections");
processChildren(compositeProcessor, bean, beanDefinitionReader);
- moveToProperyListElement(bean, "service-unit", "serviceUnits");
-
logXmlGenerated(log, "Adding new beans", beans);
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java Mon Feb 13 04:50:52 2006
@@ -52,7 +52,7 @@
registerBeanPropertyProcessor("bootstrap-class-path", ClassPath.class);
registerBeanPropertyProcessor("component-class-path", ClassPath.class);
registerProcessor("component", new ComponentElementProcessor(this));
- registerBeanPropertyProcessor("connection", Connection.class);
+ registerBeanProcessor("connection", Connection.class);
registerBeanPropertyProcessor("connections", Connections.class);
registerBeanPropertyProcessor("consumer", Consumer.class);
registerBeanPropertyProcessor("consumes", Consumes.class);
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java Mon Feb 13 04:50:52 2006
@@ -484,7 +484,7 @@
protected void buildConnections(ServiceAssembly sa) throws JBIException {
if (sa != null) {
- Connection[] connections = sa.getConnections().getConnection();
+ Connection[] connections = sa.getConnections().getConnections();
if (connections != null) {
for (int i = 0; i < connections.length; i++) {
Connection connection = connections[i];
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java Mon Feb 13 04:50:52 2006
@@ -25,6 +25,8 @@
import java.util.Arrays;
+import javax.xml.namespace.QName;
+
/**
* @version $Revision$
*/
@@ -57,6 +59,12 @@
assertEquals("getIdentification().getDescription() for 3", "Description of Serviceunit: SequencingEngineSU", serviceUnits[3].getIdentification().getDescription());
assertEquals("getTarget().getArtifactsZip() for 3", "SequencingEngineSU.zip", serviceUnits[3].getTarget().getArtifactsZip());
assertEquals("getTarget().getComponentName() for 3", "SunSequencingEngine", serviceUnits[3].getTarget().getComponentName());
+
+ Connection[] connections = serviceAssembly.getConnections().getConnections();
+ assertNotNull("connections are null", connections);
+ assertEquals("connections size", 2, connections.length);
+
+ assertEquals("getConsumer().getServiceName() for 0", new QName("http://www.gaiati.com/emee/ns/csi", "csi-service"), connections[0].getConsumer().getServiceName());
}
protected AbstractXmlApplicationContext createBeanFactory() throws Exception {
Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/deployment/serviceAssembly.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/deployment/serviceAssembly.xml?rev=377368&r1=377367&r2=377368&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/deployment/serviceAssembly.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/deployment/serviceAssembly.xml Mon Feb 13 04:50:52 2006
@@ -1,49 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbi version="1" xmlns="http://java.sun.com/xml/ns/jbi">
- <service-assembly>
- <identification>
- <name>ServiceAssembly_041207153211-0800_saId</name>
- <description>Description of Service Assembly : ServiceAssembly</description>
- </identification>
- <service-unit>
- <identification>
- <name>TransformationSU_041207152821-0800_suId</name>
- <description>Description of Serviceunit: TransformationSU</description>
- </identification>
- <target>
- <artifacts-zip>TransformationSU.zip</artifacts-zip>
- <component-name>SunTransformationEngine</component-name>
- </target>
- </service-unit>
- <service-unit>
- <identification>
- <name>FileBindingSU_041207152212-0800_suId</name>
- <description>Description of ServiceUnit: FileBindingSU</description>
- </identification>
- <target>
- <artifacts-zip>FileBindingSU.zip</artifacts-zip>
- <component-name>SunFileBinding</component-name>
- </target>
- </service-unit>
- <service-unit>
- <identification>
- <name>SoapBindingSU_041207152833-0800_suId</name>
- <description>Description of Service unit: SoapBindingSU</description>
- </identification>
- <target>
- <artifacts-zip>SoapBindingSU.zip</artifacts-zip>
- <component-name>SunSOAPBinding</component-name>
- </target>
- </service-unit>
- <service-unit>
- <identification>
- <name>SequencingEngineSU_041207152507-0800_suId</name>
- <description>Description of Serviceunit: SequencingEngineSU</description>
- </identification>
- <target>
- <artifacts-zip>SequencingEngineSU.zip</artifacts-zip>
- <component-name>SunSequencingEngine</component-name>
- </target>
- </service-unit>
- </service-assembly>
+<jbi version="1" xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:csi="http://www.gaiati.com/emee/ns/csi">
+ <service-assembly>
+ <identification>
+ <name>ServiceAssembly_041207153211-0800_saId</name>
+ <description>Description of Service Assembly : ServiceAssembly</description>
+ </identification>
+ <service-unit>
+ <identification>
+ <name>TransformationSU_041207152821-0800_suId</name>
+ <description>Description of Serviceunit: TransformationSU</description>
+ </identification>
+ <target>
+ <artifacts-zip>TransformationSU.zip</artifacts-zip>
+ <component-name>SunTransformationEngine</component-name>
+ </target>
+ </service-unit>
+ <service-unit>
+ <identification>
+ <name>FileBindingSU_041207152212-0800_suId</name>
+ <description>Description of ServiceUnit: FileBindingSU</description>
+ </identification>
+ <target>
+ <artifacts-zip>FileBindingSU.zip</artifacts-zip>
+ <component-name>SunFileBinding</component-name>
+ </target>
+ </service-unit>
+ <service-unit>
+ <identification>
+ <name>SoapBindingSU_041207152833-0800_suId</name>
+ <description>
+ Description of Service unit: SoapBindingSU
+ </description>
+ </identification>
+ <target>
+ <artifacts-zip>SoapBindingSU.zip</artifacts-zip>
+ <component-name>SunSOAPBinding</component-name>
+ </target>
+ </service-unit>
+ <service-unit>
+ <identification>
+ <name>SequencingEngineSU_041207152507-0800_suId</name>
+ <description>Description of Serviceunit: SequencingEngineSU</description>
+ </identification>
+ <target>
+ <artifacts-zip>SequencingEngineSU.zip</artifacts-zip>
+ <component-name>SunSequencingEngine</component-name>
+ </target>
+ </service-unit>
+ <connections>
+ <connection>
+ <consumer service-name="csi:csi-service"
+ endpoint-name="csi-email-endpoint" />
+ <provider service-name="ems:ems-service"
+ endpoint-name="ems-smtp-endpoint" />
+ </connection>
+ <connection>
+ <consumer service-name="csi:csi-service"
+ endpoint-name="csi-soap-email-endpoint" />
+ <provider service-name="ems:ems-service"
+ endpoint-name="ems-smtp-endpoint" />
+ </connection>
+ </connections>
+ </service-assembly>
</jbi>