You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2009/12/07 21:57:29 UTC
svn commit: r888134 - in /ode/branches/APACHE_ODE_1.X: Rakefile
jbi-karaf/bnd.bnd jbi-karaf/src/main/filtered-resources/features.xml
Author: rr
Date: Mon Dec 7 20:57:29 2009
New Revision: 888134
URL: http://svn.apache.org/viewvc?rev=888134&view=rev
Log:
ODE-705: OSGi packaging update (by Greg Lucas)
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/features.xml
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=888134&r1=888133&r2=888134&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Mon Dec 7 20:57:29 2009
@@ -50,14 +50,14 @@
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0"
COMMONS = struct(
:codec =>"commons-codec:commons-codec:jar:1.3",
- :collections =>"commons-collections:commons-collections:jar:3.1",
- :dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.1",
+ :collections =>"commons-collections:commons-collections:jar:3.2.1",
+ :dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.2",
:fileupload =>"commons-fileupload:commons-fileupload:jar:1.1.1",
- :httpclient =>"commons-httpclient:commons-httpclient:jar:3.0",
- :lang =>"commons-lang:commons-lang:jar:2.3",
+ :httpclient =>"commons-httpclient:commons-httpclient:jar:3.1",
+ :lang =>"commons-lang:commons-lang:jar:2.4",
:logging =>"commons-logging:commons-logging:jar:1.1",
:io =>"commons-io:commons-io:jar:1.4",
- :pool =>"commons-pool:commons-pool:jar:1.2",
+ :pool =>"commons-pool:commons-pool:jar:1.4",
:primitives =>"commons-primitives:commons-primitives:jar:1.0"
)
DERBY = "org.apache.derby:derby:jar:10.5.3.0_1"
@@ -156,11 +156,15 @@
BUNDLE_VERSIONS = {
"ode.version" => VERSION_NUMBER,
+ "commons.collections.version" => artifact(COMMONS.collections).version,
+ "commons.httpclient.bundle.version" => "3.1_1",
+ "commons.lang.version" => artifact(COMMONS.lang).version,
+ "commons.pool.version" => artifact(COMMONS.pool).version,
"derby.version" => artifact(DERBY).version,
+ "geronimo.specs.version" => "1.1.1",
"servicemix.nmr.version" => "1.1.0-SNAPSHOT",
- "servicemix.specs.version" => "1.4-SNAPSHOT",
"servicemix.shared.version" => "2009.02-SNAPSHOT",
- "geronimo.specs.version" => "1.1.1",
+ "servicemix.specs.version" => "1.4-SNAPSHOT",
}
Release.find.tag_name = lambda { |version| "APACHE_ODE_#{version.upcase}" } if Release.find
@@ -583,9 +587,9 @@
bnd.properties["inlines"] = inlines.join(', ')
# embed jars
- bnd_libs = ode_libs + artifacts(AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp,
- COMMONS.lang, COMMONS.pool, COMMONS.primitives, GERONIMO.connector,
- JAXEN, JAVAX.connector, JAVAX.persistence, JAVAX.ejb, OPENJPA, SAXON, TRANQL,
+ bnd_libs = ode_libs + artifacts(AXIOM, BACKPORT, GERONIMO.connector, JAXEN,
+ JAVAX.connector, JAVAX.persistence, JAVAX.ejb,
+ OPENJPA, SAXON, TRANQL,
XALAN, XERCES, XMLBEANS, WSDL4J)
includes = bnd_libs.map{|item| File.basename(item.to_s)}
bnd.properties["includes"] = includes.join(', ')
Modified: ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd?rev=888134&r1=888133&r2=888134&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd (original)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd Mon Dec 7 20:57:29 2009
@@ -3,8 +3,8 @@
Bundle-Version: ${ode.version}
Export-Package: org.apache.ode.jbi;version=${ode.version}, \
- org.apache.ode.bpel.pmapi;version=${ode.version}
-Private-Package: org.apache.ode.jbi*;version=${ode.version}
+ org.apache.ode.bpel.pmapi;version=${ode.version};-split-package:=merge-first
+ Private-Package: org.apache.ode.jbi.*;version=${ode.version}
Import-Package: \
!com.sun.mirror*, \
@@ -15,6 +15,7 @@
javax.transaction*;version="1.1", \
org.apache.commons.httpclient*;version="3.0", \
org.apache.commons.logging*;version="1.1", \
+ org.apache.commons*, \
org.apache.geronimo.transaction.manager;version="2.0", \
org.osgi.service.command;version="[0.2,1)", \
org.springframework.beans.factory.xml;version="2.5", \
Modified: ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/features.xml?rev=888134&r1=888133&r2=888134&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/features.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/features.xml Mon Dec 7 20:57:29 2009
@@ -19,10 +19,14 @@
<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>
+ <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>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+ <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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
<bundle>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/jar/bundle</bundle>
</feature>