Author: rr
Date: Thu Mar 11 22:16:23 2010
New Revision: 922037
URL: http://svn.apache.org/viewvc?rev=922037&view=rev
Log:
Karaf features update
Modified:
ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
Modified: ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml?rev=922037&r1=922036&r2=922037&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml Thu Mar 11 22:16:23 2010
@@ -54,6 +54,7 @@
!org.apache.tools.ant*,
javax.jbi*;version="1.0",
javax.transaction*;version="1.1",
+ org.tranql.connector.jdbc,
org.apache.commons.httpclient*;version="3.0",
org.apache.commons.logging*;version="1.1",
org.apache.commons*,
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=922037&r1=922036&r2=922037&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 22:16:23 2010
@@ -17,23 +17,16 @@
limitations under the License.
-->
<features>
-
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
<feature name="ode" version="${ode.version}">
- <feature version="${servicemix.nmr.version}">transaction</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.specs.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.specs.version}</bundle>
+ <feature>transaction</feature>
<bundle>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
- <bundle>mvn:commons-lang/commons-lang/${commons.lang.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.commons-httpclient/3.1_1</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_3</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
</feature>
<feature name="ode-hib" version="${project.version}">
- <bundle>wrap:mvn:org.tranql/tranql-connector/1.4</bundle>
<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>
@@ -44,14 +37,17 @@
<feature version="${project.version}">ode</feature>
</feature>
<feature name="ode-derby" 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}">
<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}">
<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}">
@@ -62,4 +58,7 @@
<feature version="${project.version}">ode-oracle</feature>
<feature version="${project.version}">ode-hib</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>
</features>
