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/10/25 14:05:59 UTC
svn commit: r588207 - in /incubator/servicemix/branches/servicemix-4.0:
apache-servicemix/ apache-servicemix/src/main/descriptors/ bundles/ jbi/
jbi/api/ jbi/osgi/ jbi/osgi/src/main/resources/META-INF/spring/ jbi/runtime/
Author: gnodet
Date: Thu Oct 25 05:05:58 2007
New Revision: 588207
URL: http://svn.apache.org/viewvc?rev=588207&view=rev
Log:
Fix JBI layer
Added:
incubator/servicemix/branches/servicemix-4.0/jbi/api/
- copied from r588205, incubator/servicemix/trunk/core/servicemix-jbi/
Modified:
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml
incubator/servicemix/branches/servicemix-4.0/jbi/api/pom.xml
incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml
incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml
incubator/servicemix/branches/servicemix-4.0/jbi/runtime/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=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Thu Oct 25 05:05:58 2007
@@ -143,6 +143,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${camel.version}</version>
@@ -196,6 +211,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Thu Oct 25 05:05:58 2007
@@ -165,13 +165,26 @@
<!-- Management -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
- </includes>
- </dependencySet>
+ <outputDirectory>/bundle</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.servicemix.management:org.apache.servicemix.management.core</include>
+ </includes>
+ </dependencySet>
+
+ <!-- JBI 1.0 -->
+ <dependencySet>
+ <outputDirectory>/bundle</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+ </includes>
+ </dependencySet>
</dependencySets>
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=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/bundles/pom.xml Thu Oct 25 05:05:58 2007
@@ -39,6 +39,7 @@
<module>cglib</module>
<module>jaxb-api</module>
<module>jaxb-impl</module>
+ <module>jbi</module>
<module>httpcore</module>
</modules>
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/api/pom.xml?rev=588207&r1=588205&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/api/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/api/pom.xml Thu Oct 25 05:05:58 2007
@@ -22,38 +22,40 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>core</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>jbi</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
- <artifactId>servicemix-jbi</artifactId>
- <name>ServiceMix :: JBI</name>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.api</artifactId>
+ <packaging>bundle</packaging>
+ <version>4.0-SNAPSHOT</version>
+ <name>ServiceMix JBI API</name>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk1.4</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>javax.jbi*</Export-Package>
+ <Import-Package>*</Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml?rev=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml Thu Oct 25 05:05:58 2007
@@ -51,6 +51,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package></Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
+ <Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml?rev=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml Thu Oct 25 05:05:58 2007
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd">
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<!-- JBI Component Registry -->
<bean id="componentRegistry" class="org.apache.servicemix.jbi.runtime.impl.ComponentRegistryImpl">
@@ -43,8 +43,7 @@
<!-- Reference to the ServiceMix NMR -->
<osgi:reference id="nmr"
- interface="org.apache.servicemix.api.NMR"
- cardinality="1..1" />
+ interface="org.apache.servicemix.api.NMR" />
<!-- Expose the JBI components registry in OSGi -->
<osgi:service ref="componentRegistry">
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml?rev=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml Thu Oct 25 05:05:58 2007
@@ -34,6 +34,7 @@
<name>ServiceMix JBI</name>
<modules>
+ <module>api</module>
<module>runtime</module>
<module>osgi</module>
</modules>
Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml?rev=588207&r1=588206&r2=588207&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml Thu Oct 25 05:05:58 2007
@@ -40,9 +40,9 @@
<version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>3.1.2</version>
+ <groupId>org.apache.servicemix.jbi</groupId>
+ <artifactId>org.apache.servicemix.jbi.api</artifactId>
+ <version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -78,7 +78,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}</Export-Package>
+ <Export-Package>${pom.artifactId}*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>