Author: rr
Date: Thu Mar 11 23:27:04 2010
New Revision: 922063
URL: http://svn.apache.org/viewvc?rev=922063&view=rev
Log:
Features update - included ping pong osgi into build
Modified:
ode/branches/APACHE_ODE_1.X/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
ode/branches/APACHE_ODE_1.X/pom.xml
Modified:
ode/branches/APACHE_ODE_1.X/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml?rev=922063&r1=922062&r2=922063&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
Thu Mar 11 23:27:04 2010
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ode.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
- <version>1.0.0</version>
+ <version>1.3.4-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
Modified: ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml?rev=922063&r1=922062&r2=922063&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml (original)
+++ ode/branches/APACHE_ODE_1.X/distro/src/main/assembly/jbi.xml Thu Mar 11
23:27:04 2010
@@ -30,6 +30,9 @@
<fileSet>
<directory>src/examples-jbi</directory>
<outputDirectory>/examples</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
</fileSet>
<fileSet>
Modified: ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml?rev=922063&r1=922062&r2=922063&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
(original)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml Thu
Mar 11 23:27:04 2010
@@ -17,48 +17,60 @@
limitations under the License.
-->
<features>
- <feature name="ode" version="${ode.version}">
+ <feature name="ode-core-deps" version="${ode.version}">
<feature>transaction</feature>
<bundle>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
<bundle>mvn:commons-beanutils/commons-beanutils/1.8.2</bundle>
<bundle>mvn:commons-io/commons-io/1.4</bundle>
<bundle>wrap:mvn:jaxen/jaxen/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_1-SNAPSHOT</bundle>
+ </feature>
+ <feature name="ode-core" version="${ode.version}">
<bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
</feature>
- <feature name="ode-hib" version="${project.version}">
+ <feature name="ode-hib-deps" version="${project.version}">
<bundle>wrap:mvn:dom4j/dom4j/1.6.1</bundle>
<bundle>wrap:mvn:org.hibernate/hibernate/3.2.5.ga</bundle>
- <feature version="${project.version}">ode</feature>
</feature>
- <feature name="ode-jpa" version="${project.version}">
+ <feature name="ode-jpa-deps" version="${project.version}">
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/1.2.1_2</bundle>
- <feature version="${project.version}">ode</feature>
</feature>
- <feature name="ode-derby" version="${project.version}">
+ <feature name="ode-derby-deps" version="${project.version}">
<bundle>wrap:mvn:org.tranql/tranql-connector/1.4</bundle>
<bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
</feature>
- <feature name="ode-sqlserver" version="${project.version}">
+ <feature name="ode-sqlserver-deps" version="${project.version}">
<bundle>wrap:mvn:com.microsoft.sqlserver/sqljdbc/1.2</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector/1.4</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector-sqlserver2005-common/1.1</bundle>
</feature>
- <feature name="ode-oracle" version="${project.version}">
+ <feature name="ode-oracle-deps" version="${project.version}">
<bundle>wrap:mvn:oracle/ojdbc5/11.1.0.6.0</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector/1.4</bundle>
<bundle>wrap:mvn:org.tranql/tranql-connector-oracle-common/1.4</bundle>
</feature>
- <feature name="ode-jpa-derby" version="${project.version}">
- <feature version="${project.version}">ode-derby</feature>
- <feature version="${project.version}">ode-jpa</feature>
+ <feature name="ode" version="${project.version}">
+ <feature version="${project.version}">ode-derby-deps</feature>
+ <feature version="${project.version}">ode-jpa-deps</feature>
+ <feature version="${project.version}">ode-core-deps</feature>
+ <feature version="${project.version}">ode-core</feature>
</feature>
<feature name="ode-hib-oracle" version="${project.version}">
- <feature version="${project.version}">ode-oracle</feature>
- <feature version="${project.version}">ode-hib</feature>
+ <feature version="${project.version}">ode-oracle-deps</feature>
+ <feature version="${project.version}">ode-hib-deps</feature>
+ <feature version="${project.version}">ode-core-deps</feature>
+ <feature version="${project.version}">ode-core</feature>
+ </feature>
+ <feature name="ode-hib-sqlserver" version="${project.version}">
+ <feature version="${project.version}">ode-sqlserver-deps</feature>
+ <feature version="${project.version}">ode-hib-deps</feature>
+ <feature version="${project.version}">ode-core-deps</feature>
+ <feature version="${project.version}">ode-core</feature>
</feature>
- <feature name="examples-ode-ping-pong" version="1.0.0">
- <bundle>mvn:org.apache.ode.examples/ping-pong-bundle/1.0.0</bundle>
+ <feature name="examples-ode-ping-pong" version="${project.version}">
+ <feature version="${project.version}">ode</feature>
+
<bundle>mvn:org.apache.ode.examples/ping-pong-bundle/${project.version}</bundle>
</feature>
</features>
Modified: ode/branches/APACHE_ODE_1.X/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/pom.xml?rev=922063&r1=922062&r2=922063&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/pom.xml Thu Mar 11 23:27:04 2010
@@ -133,6 +133,7 @@
<module>jbi</module>
<module>jbi-bundle</module>
<module>jbi-karaf</module>
+ <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
<module>axis2-war</module>
<module>distro</module>
</modules>
