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 2007/09/20 16:19:58 UTC
svn commit: r577761 [1/2] - in
/incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/
apache-servicemix/src/main/installers/ api/
api/src/main/java/org/apache/servicemix/api/ bundles/ bundles/activation/
bundles/httpcore/ bundles/j2ee-man...
Author: gnodet
Date: Thu Sep 20 07:19:51 2007
New Revision: 577761
URL: http://svn.apache.org/viewvc?rev=577761&view=rev
Log:
Add an example / integration tests and a few bundles
Added:
incubator/servicemix/branches/servicemix-4.0/bundles/activation/
incubator/servicemix/branches/servicemix-4.0/bundles/activation/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/
incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/
incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/
incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/
incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/jms/
incubator/servicemix/branches/servicemix-4.0/bundles/jms/pom.xml
incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/
incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/pom.xml
incubator/servicemix/branches/servicemix-4.0/camel/
incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
incubator/servicemix/branches/servicemix-4.0/camel/src/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/
incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
incubator/servicemix/branches/servicemix-4.0/camel/src/test/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/java/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/java/org/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/java/org/apache/servicemix/camel/
incubator/servicemix/branches/servicemix-4.0/camel/src/test/resources/
incubator/servicemix/branches/servicemix-4.0/examples/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/intermediary.iml
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/
incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
incubator/servicemix/branches/servicemix-4.0/examples/pom.xml
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
incubator/servicemix/branches/servicemix-4.0/api/pom.xml
incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java
incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java
incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties
incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
incubator/servicemix/branches/servicemix-4.0/pom.xml
incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Thu Sep 20 07:19:51 2007
@@ -133,6 +133,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-logging</artifactId>
<version>1.1-4.0-SNAPSHOT</version>
@@ -400,6 +405,13 @@
<source>org.apache.servicemix:org.apache.servicemix.nmr</source>
<destinationPath>
bundle/org.apache.servicemix.nmr-${project.version}.jar
+ </destinationPath>
+ </packagedFile>
+ <packagedFile>
+ <dependency>true</dependency>
+ <source>org.apache.camel:camel-core</source>
+ <destinationPath>
+ bundle/org.apache.camel.core-${camel.version}.jar
</destinationPath>
</packagedFile>
<packagedFile>
Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/installers/config.properties Thu Sep 20 07:19:51 2007
@@ -41,6 +41,7 @@
"file:${servicemix.home}/bundle/org.apache.servicemix.spring-4.0-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.core-4.0-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.api-4.0-SNAPSHOT.jar" \
+ "file:${servicemix.home}/bundle/org.apache.camel.core-1.1-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.servlet-2.5-4.0-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.commons-logging-1.1-4.0-SNAPSHOT.jar" \
"file:${servicemix.home}/bundle/org.apache.servicemix.bundles.aopalliance-1.0-4.0-SNAPSHOT.jar"
@@ -60,290 +61,431 @@
# Java platform package export properties.
#
jre-1.3= \
- javax.accessibility; \
- javax.accessibility.resources; \
- 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.basic.resources; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.metal.resources; \
- 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; \
- 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"
+ 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.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.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.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.apache.crimson.jaxp; \
- org.apache.crimson.parser; \
- org.apache.crimson.parser.resources; \
- org.apache.crimson.tree; \
- org.apache.crimson.tree.resources; \
- org.apache.crimson.util; \
- org.apache.xalan; \
- org.apache.xalan.client; \
- org.apache.xalan.extensions; \
- org.apache.xalan.lib; \
- org.apache.xalan.lib.sql; \
- org.apache.xalan.processor; \
- org.apache.xalan.res; \
- org.apache.xalan.serialize; \
- org.apache.xalan.templates; \
- org.apache.xalan.trace; \
- org.apache.xalan.transformer; \
- org.apache.xalan.xslt; \
- org.apache.xml.dtm; \
- org.apache.xml.dtm.ref; \
- org.apache.xml.dtm.ref.dom2dtm; \
- org.apache.xml.dtm.ref.sax2dtm; \
- org.apache.xml.utils; \
- org.apache.xml.utils.res; \
- org.apache.xml.utils.synthetic; \
- org.apache.xml.utils.synthetic.reflection; \
- org.apache.xpath; \
- org.apache.xpath.axes; \
- org.apache.xpath.compiler; \
- org.apache.xpath.functions; \
- org.apache.xpath.objects; \
- org.apache.xpath.operations; \
- org.apache.xpath.patterns; \
- org.apache.xpath.res; \
- 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"
+ 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; \
+ 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"
-jre-1.5= \
- javax.accessibility; \
- javax.activity; \
- 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.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.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"
Modified: incubator/servicemix/branches/servicemix-4.0/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/pom.xml Thu Sep 20 07:19:51 2007
@@ -44,7 +44,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${felix.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/api/src/main/java/org/apache/servicemix/api/Message.java Thu Sep 20 07:19:51 2007
@@ -83,6 +83,14 @@
<T> void setHeader(Class<T> type, T value);
/**
+ * Remove the given header and returns its value.
+ *
+ * @param name the name of the header
+ * @return the previous value
+ */
+ Object removeHeader(String name);
+
+ /**
* Get a map of all the headers for this message
*
* @return a map of headers
@@ -90,6 +98,13 @@
Map<String, Object> getHeaders();
/**
+ * Set all the headers
+ *
+ * @param headers the new map of headers
+ */
+ void setHeaders(Map<String, Object> headers);
+
+ /**
* Retrieve an attachment given its id.
*
* @param id the id of the attachment to retrieve
@@ -142,6 +157,13 @@
void setContent(Object content);
/**
+ * Set the content of the message.
+ *
+ * @param content the content of the message
+ */
+ <T> void setContent(Object content, Class<T> type);
+
+ /**
* Get the mime content type describing the content of the message
*
* @return the mime content type
@@ -196,4 +218,5 @@
// TODO: is toString() sufficient ?
String display(boolean displayContent);
+
}
Added: incubator/servicemix/branches/servicemix-4.0/bundles/activation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/activation/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/activation/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/activation/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>activation</pkgArtifactId>
+ <pkgVersion>1.1</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>javax.activation*,com.sun.activation*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>httpcore</pkgArtifactId>
+ <pkgVersion>4.0-alpha5</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>org.apache.http</servicemix.osgi.export.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>${pkgArtifactId}-nio</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>${pkgArtifactId}-niossl</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/j2ee-management/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>j2ee-management</pkgArtifactId>
+ <pkgVersion>1.0</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.import.pkg>javax.ejb*;resolution:=optional,*</servicemix.osgi.import.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-${pkgArtifactId}_${pkgVersion}_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>jaxb-api</pkgArtifactId>
+ <pkgVersion>2.0</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>javax.xml.bind*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>javax.xml.stream*;resolution:=optional,*</servicemix.osgi.import.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>jaxb-impl</pkgArtifactId>
+ <pkgVersion>2.0.3</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>com.sun.xml.bind*,com.sun.istack*,com.sun.xml.txw2*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>javax.xml.stream*;resolution:=optional,
+ com.sun.xml.fastinfoset*;resolution:=optional,
+ org.jvnet.staxex*;resolution:=optional,
+ *</servicemix.osgi.import.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/jms/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/jms/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/jms/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>jms</pkgArtifactId>
+ <pkgVersion>1.1</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-${pkgArtifactId}_${pkgVersion}_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml Thu Sep 20 07:19:51 2007
@@ -35,8 +35,15 @@
<modules>
<module>servlet</module>
+ <module>j2ee-management</module>
<module>commons-logging</module>
<module>aopalliance</module>
+ <module>jaxb-api</module>
+ <module>jaxb-impl</module>
+ <module>jms</module>
+ <module>stax-api</module>
+ <module>activation</module>
+ <module>httpcore</module>
</modules>
<properties>
Added: incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/stax-api/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>bundles</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>stax-api</pkgArtifactId>
+ <pkgVersion>1.0.1</pkgVersion>
+ <pomVersion>4.0-SNAPSHOT</pomVersion>
+ <servicemix.osgi.export.pkg>javax.xml.stream*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>*</servicemix.osgi.import.pkg>
+ </properties>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-${pomVersion}</version>
+ <packaging>bundle</packaging>
+ <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.camel</artifactId>
+ <packaging>bundle</packaging>
+ <version>4.0-SNAPSHOT</version>
+ <name>org.apache.servicemix.camel</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${pom.artifactId}</Export-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.servicemix.api.NMR;
+
+import java.util.Map;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 8:48:25 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixComponent extends DefaultComponent {
+
+ private NMR nmr;
+
+ public NMR getNmr() {
+ return nmr;
+ }
+
+ public void setNmr(NMR nmr) {
+ this.nmr = nmr;
+ }
+
+ protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ return new ServiceMixEndpoint(this, uri);
+ }
+
+ public void registerEndpoint(org.apache.servicemix.api.Endpoint endpoint, Map<String, ?> properties) {
+ nmr.getEndpointRegistry().register(endpoint, properties);
+ }
+
+ public void unregisterEndpoint(org.apache.servicemix.api.Endpoint endpoint, Map<String, ?> properties) {
+ nmr.getEndpointRegistry().unregister(endpoint, properties);
+ }
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultConsumer;
+import org.apache.servicemix.api.Channel;
+import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.api.Status;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 8:59:46 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixConsumer extends DefaultConsumer implements org.apache.servicemix.api.Endpoint {
+
+ private Channel channel;
+
+ public ServiceMixConsumer(ServiceMixEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+ }
+
+ public ServiceMixEndpoint getEndpoint() {
+ return (ServiceMixEndpoint) super.getEndpoint();
+ }
+
+ protected void doStart() throws Exception {
+ super.doStart();
+ getEndpoint().getComponent().registerEndpoint(this, null);
+ }
+
+ protected void doStop() throws Exception {
+ getEndpoint().getComponent().unregisterEndpoint(this, null);
+ super.doStop();
+ }
+
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
+ public void process(Exchange exchange) {
+ if (exchange.getStatus() == Status.Active) {
+ try {
+ getAsyncProcessor().process(new ServiceMixExchange(exchange));
+ } catch (Exception e) {
+ exchange.setError(e);
+ exchange.setStatus(Status.Error);
+ channel.send(exchange);
+ }
+ }
+ }
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.Producer;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Component;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 8:54:34 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixEndpoint extends DefaultEndpoint {
+
+ public ServiceMixEndpoint(ServiceMixComponent component, String uri) {
+ super(uri, component);
+ }
+
+ public ServiceMixComponent getComponent() {
+ return (ServiceMixComponent) super.getComponent();
+ }
+
+ public boolean isSingleton() {
+ return true;
+ }
+
+ public Producer createProducer() throws Exception {
+ return new ServiceMixProducer(this);
+ }
+
+ public Consumer createConsumer(Processor processor) throws Exception {
+ return new ServiceMixConsumer(this, processor);
+ }
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.UnitOfWork;
+
+import java.util.Map;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 8:50:07 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixExchange implements Exchange {
+
+ private org.apache.servicemix.api.Exchange exchange;
+ private ServiceMixMessage in;
+ private ServiceMixMessage out;
+ private ServiceMixMessage fault;
+
+ public ServiceMixExchange(org.apache.servicemix.api.Exchange exchange) {
+ this.exchange = exchange;
+ }
+
+ public ExchangePattern getPattern() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Object getProperty(String name) {
+ return exchange.getProperty(name);
+ }
+
+ public <T> T getProperty(String name, Class<T> type) {
+ return exchange.getProperty(name, type);
+ }
+
+ public void setProperty(String name, Object value) {
+ exchange.setProperty(name, value);
+ }
+
+ public Object removeProperty(String name) {
+ Object value = exchange.getProperty(name);
+ exchange.setProperty(name, null);
+ return value;
+ }
+
+ public Map<String, Object> getProperties() {
+ return exchange.getProperties();
+ }
+
+ public Message getIn() {
+ return null;
+ }
+
+ public Message getOut() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Message getOut(boolean lazyCreate) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Message getFault() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Message getFault(boolean lazyCreate) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Throwable getException() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setException(Throwable e) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public boolean isFailed() {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public CamelContext getContext() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Exchange copy() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void copyFrom(Exchange source) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public UnitOfWork getUnitOfWork() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getExchangeId() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setExchangeId(String id) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.Message;
+import org.apache.camel.Exchange;
+import org.apache.camel.util.UuidGenerator;
+
+import java.util.Map;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 9:06:27 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixMessage implements Message {
+
+ private static final UuidGenerator DEFALT_ID_GENERATOR = new UuidGenerator();
+
+ private ServiceMixExchange exchange;
+ private org.apache.servicemix.api.Message message;
+ private String messageId = DEFALT_ID_GENERATOR.generateId();
+
+ public ServiceMixMessage(ServiceMixExchange exchange, org.apache.servicemix.api.Message message) {
+ this.message = message;
+ }
+
+ public String getMessageId() {
+ return messageId; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setMessageId(String messageId) {
+ this.messageId = messageId;
+ }
+
+ public Exchange getExchange() {
+ return exchange;
+ }
+
+ public Object getHeader(String name) {
+ return message.getHeader(name);
+ }
+
+ public <T> T getHeader(Class<T> type) {
+ return message.getHeader(type);
+ }
+
+ public <T> T getHeader(String name, Class<T> type) {
+ return message.getHeader(name, type);
+ }
+
+ public void setHeader(String name, Object value) {
+ message.setHeader(name, value);
+ }
+
+ public Object removeHeader(String name) {
+ return message.removeHeader(name);
+ }
+
+ public <T> void setHeader(Class<T> type, T value) {
+ message.setHeader(type, value);
+ }
+
+ public Map<String, Object> getHeaders() {
+ return message.getHeaders();
+ }
+
+ public void setHeaders(Map<String, Object> headers) {
+ message.setHeaders(headers);
+ }
+
+ public Object getBody() {
+ return message.getContent();
+ }
+
+ public <T> T getBody(Class<T> type) {
+ return message.getContent(type);
+ }
+
+ public void setBody(Object content) {
+ message.setContent(content);
+ }
+
+ public <T> void setBody(Object content, Class<T> type) {
+ message.setContent(content, type);
+ }
+
+ public Message copy() {
+ Message msg = new ServiceMixMessage(null, message.copy());
+ msg.setMessageId(getMessageId());
+ return msg;
+ }
+
+ public void copyFrom(Message message) {
+ setMessageId(message.getMessageId());
+ setBody(message.getBody());
+ setHeaders(message.getHeaders());
+ }
+
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java Thu Sep 20 07:19:51 2007
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.camel;
+
+import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.Exchange;
+import org.apache.camel.Endpoint;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 19, 2007
+ * Time: 8:59:25 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class ServiceMixProducer extends DefaultProducer {
+
+ public ServiceMixProducer(ServiceMixEndpoint endpoint) {
+ super(endpoint);
+ }
+
+ public ServiceMixEndpoint getEndpoint() {
+ return (ServiceMixEndpoint) super.getEndpoint();
+ }
+
+ public void process(Exchange exchange) throws Exception {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
Added: incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/smx?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/smx (added)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/resources/META-INF/services/org/apache/camel/component/smx Thu Sep 20 07:19:51 2007
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.servicemix.camel.ServiceMixComponent
Modified: incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/core/src/main/java/org/apache/servicemix/core/MessageImpl.java Thu Sep 20 07:19:51 2007
@@ -42,10 +42,21 @@
public MessageImpl() {
}
+ /**
+ * Returns the content of the message in its default format.
+ *
+ * @return the main content of this message
+ */
public Object getContent() {
return content;
}
+ /**
+ * Returns the content as the specified type.
+ *
+ * @param type the type in which the content is to be transformed
+ * @return the transformed content
+ */
public <T> T getContent(Class<T> type) {
// TODO: use converters
if (type.isInstance(content)) {
@@ -54,11 +65,26 @@
return null;
}
+ /**
+ * Set the content of the message.
+ *
+ * @param content the content of the message
+ */
public void setContent(Object content) {
this.content = content;
}
/**
+ * Set the content of the message.
+ *
+ * @param content the content of the message
+ */
+ public <T> void setContent(Object content, Class<T> type) {
+ // TODO: use converters
+ this.content = content;
+ }
+
+ /**
* Get the mime content type describing the content of the message
*
* @return the mime content type
@@ -94,6 +120,12 @@
this.contentEncoding = encoding;
}
+ /**
+ * Get a header on this message.
+ *
+ * @param name the name of the header
+ * @return the value of the header of <code>null</code> if none has been set
+ */
public Object getHeader(String name) {
if (headers == null) {
return null;
@@ -101,6 +133,15 @@
return headers.get(name);
}
+ /**
+ * Get a header, converting it to the desired type
+ *
+ * @param name the name of the header
+ * @param type the desired type
+ * @return the converted header or <code>null</code> if
+ * no header has been set or if it can not be transformed
+ * to the desired type
+ */
public <T> T getHeader(String name, Class<T> type) {
if (headers == null) {
return null;
@@ -108,6 +149,14 @@
return (T) headers.get(name);
}
+ /**
+ * Get a typed header.
+ * This is equivalent to:
+ * <code>exchange.getHeader(type.getName())</code>
+ *
+ * @param type the type of the header
+ * @return the header
+ */
public <T> T getHeader(Class<T> type) {
if (headers == null) {
return null;
@@ -115,6 +164,11 @@
return (T) headers.get(type.getName());
}
+ /**
+ * Set a header for this message
+ * @param name the name of the header
+ * @param value the value of the header
+ */
public void setHeader(String name, Object value) {
if (headers == null) {
headers = new HashMap<String, Object>();
@@ -122,6 +176,15 @@
headers.put(name, value);
}
+ /**
+ * Set a typed header for this message.
+ * This is equivalent to:
+ * <code>exchange.setHeader(type.getName(), value)</code>
+ *
+ *
+ * @param type the type of the header
+ * @param value the value of the header
+ */
public <T> void setHeader(Class<T> type, T value) {
if (headers == null) {
headers = new HashMap<String, Object>();
@@ -129,6 +192,24 @@
headers.put(type.getName(), value);
}
+ /**
+ * Remove the given header and returns its value.
+ *
+ * @param name the name of the header
+ * @return the previous value
+ */
+ public Object removeHeader(String name) {
+ if (headers == null) {
+ return null;
+ }
+ return headers.remove(name);
+ }
+
+ /**
+ * Get a map of all the headers for this message
+ *
+ * @return a map of headers
+ */
public Map<String, Object> getHeaders() {
if (headers == null) {
headers = new HashMap<String, Object>();
@@ -136,6 +217,21 @@
return headers;
}
+ /**
+ * Set all the headers
+ *
+ * @param headers the new map of headers
+ */
+ public void setHeaders(Map<String, Object> headers) {
+ this.headers = headers;
+ }
+
+ /**
+ * Retrieve an attachment given its id.
+ *
+ * @param id the id of the attachment to retrieve
+ * @return the attachement or <code>null</code> if none exists
+ */
public Object getAttachment(String id) {
if (attachments != null) {
return null;
@@ -143,6 +239,12 @@
return attachments.get(id);
}
+ /**
+ * Add an attachment to this message
+ *
+ * @param id the id of the attachment
+ * @param value the attachment to add
+ */
public void addAttachment(String id, Object value) {
if (attachments != null) {
attachments = new HashMap<String, Object>();
@@ -150,12 +252,22 @@
attachments.put(id, value);
}
+ /**
+ * Remove an attachment on this message
+ *
+ * @param id the id of the attachment to remove
+ */
public void removeAttachment(String id) {
if (attachments != null) {
attachments.remove(id);
}
}
+ /**
+ * Retrieve a map of all attachments
+ *
+ * @return the map of attachments
+ */
public Map<String, Object> getAttachments() {
if (attachments != null) {
attachments = new HashMap<String, Object>();
@@ -163,10 +275,23 @@
return attachments;
}
+ /**
+ * Make sure that all streams contained in the content and in
+ * attachments are transformed to re-readable sources.
+ * This method will be called by the framework when persisting
+ * the message or when displaying it.
+ *
+ * TODO: do we really need this method
+ */
public void ensureReReadable() {
// TODO: implement
}
+ /**
+ * Copies the contents of the other message into this message
+ *
+ * @param msg the message to copy from
+ */
public void copyFrom(Message msg) {
content = msg.getContent();
if (!msg.getHeaders().isEmpty()) {
@@ -187,6 +312,12 @@
}
}
+ /**
+ * Creates a copy of this message so that it can
+ * be used and possibly modified further in another exchange
+ *
+ * @return a new message instance copied from this message
+ */
public Message copy() {
MessageImpl copy = new MessageImpl();
copy.copyFrom(this);
Added: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/intermediary.iml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/intermediary.iml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/intermediary.iml (added)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/intermediary.iml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<module version="4" relativePaths="false" type="JAVA_MODULE">
+ <component name="NewModuleRootManager">
+ <exclude-output/>
+ <orderEntry type="inheritedJdk"/>
+ <!-- output url="file://$$MODULE_DIR$$/${maven.build.dest}"/ -->
+ <!-- output-test url="file://$$MODULE_DIR$$/${maven.test.dest}"/ -->
+ <content url="file://$MODULE_DIR$">
+ <!-- sourceFolder url="file://$$MODULE_DIR$$/${pom.build.sourceDirectory}" isTestSource="false"/ -->
+ <!-- sourceFolder url="file://$$MODULE_DIR$$/${pom.build.testSourceDirectory}" isTestSource="true"/ -->
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false"/>
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false"/>
+ <excludeFolder url="file://$MODULE_DIR$/target"/>
+ </content>
+ <orderEntry type="sourceFolder" forTests="false"/>
+ <!-- Next include each dependency:
+ <orderEntry type="module" module-name="${dep.artifactId}"/>
+ <orderEntry type="module-library">
+ <library name="${dep.artifactId}">
+ <CLASSES>
+ <root url="jar://${lib.path}!/"/>
+ </CLASSES>
+ <JAVADOC/>
+ <SOURCES/>
+ </library>
+ </orderEntry>
+ -->
+ <output url="file://$MODULE_DIR$/target/classes"/>
+ <output-test url="file://$MODULE_DIR$/target/test-classes"/>
+ </component>
+ <component name="ModuleRootManager"/>
+ <!-- If it's a war project:
+ <component name="WebModuleProperties">
+ <containerElement type="module" name="${dep.artifactId}">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ <containerElement type="library" level="module" name="${dep.artifactId}">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/${dep.systemPath.name}" />
+ </containerElement>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/${pom.build.warSourceDirectory}/WEB-INF/web.xml" version="" />
+ <webroots>
+ <root url="file://$MODULE_DIR$/${pom.build.warSourceDirectory}" relative="/" />
+ </webroots>
+ </component>
+ -->
+</module>