Author: vanto
Date: Thu Jan 6 18:26:32 2011
New Revision: 1055992
URL: http://svn.apache.org/viewvc?rev=1055992&view=rev
Log:
jbi osgi bundling fix.
Removed:
ode/trunk/jbi-bundle/src/main/filtered-resources/features.xml
Modified:
ode/trunk/Rakefile
ode/trunk/dependencies.rb
ode/trunk/jbi-bundle/pom.xml
ode/trunk/jbi-karaf/src/main/resources/features.xml
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1055992&r1=1055991&r2=1055992&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Jan 6 18:26:32 2011
@@ -467,6 +467,17 @@ define "ode" do
define "jbi-karaf" do
resources.filter.using(BUNDLE_VERSIONS)
package :jar
+ # Generate features.xml
+ def package_as_feature(file_name)
+ file file_name => [_("src/main/resources/features.xml")] do
+
filter(_("src/main/resources")).include("features.xml").into(_("target")).using(BUNDLE_VERSIONS).run
+ mv _("target/features.xml"), file_name
+ end
+ end
+ def package_as_feature_spec(spec)
+ spec.merge({ :type=>:xml, :classifier=>'features' })
+ end
+ package(:feature)
end
desc "ODE JBI Bundle"
@@ -479,8 +490,7 @@ define "ode" do
COMMONS.primitives, COMMONS.io, DERBY,
GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector,
JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream,
JAVAX.transaction, LOG4J, OPENJPA,
SAXON, TRANQL, XALAN, XERCES, XMLBEANS, WSDL4J, KARAF)
- compile.with projects("bpel-schemas", "jbi"), JBI, libs
- filter('src/main/filtered-resources').into('target').using(BUNDLE_VERSIONS)
+ compile.with projects("bpel-schemas", "jbi", "bpel-api"), JBI, libs,
KARAF, SPRING, SPRING_OSGI
package(:bundle).tap do |bnd|
# inline dao zip files
@@ -505,6 +515,7 @@ define "ode" do
bnd['Bundle-Vendor'] = 'Apache Software Foundation'
bnd['Bundle-License'] = 'http://www.apache.org/licenses/LICENSE-2.0'
bnd['Bundle-DocURL'] = 'http://ode.apache.org'
+ bnd['Bundle-Name'] = 'Apache ODE :: BPEL Service Engine'
bnd.classpath = [project.compile.target, bnd_libs,
artifacts(project("jbi").package(:jar)), libs].flatten
BUNDLE_VERSIONS.each {|key, value| bnd[key] = value }
Modified: ode/trunk/dependencies.rb
URL:
http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=1055992&r1=1055991&r2=1055992&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Thu Jan 6 18:26:32 2011
@@ -92,6 +92,7 @@ JENCKS = "org.jencks:jencks
JIBX = "jibx:jibx-run:jar:1.1-beta3"
KARAF = [
"org.apache.felix:org.osgi.core:jar:1.4.0",
+ "org.apache.felix:org.osgi.compendium:jar:1.4.0",
"org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console:jar:1.0.0",
group("org.apache.felix.gogo.commands","org.apache.felix.gogo.runtime",
:under=>"org.apache.felix.gogo", :version=>"0.2.0")
@@ -130,7 +131,8 @@ SERVICEMIX = [
]
SLF4J = group(%w{ slf4j-api slf4j-log4j12 jcl104-over-slf4j },
:under=>"org.slf4j", :version=>"1.4.3")
SPRING = ["org.springframework:spring:jar:2.5.6"]
-SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"]
+SPRING_OSGI = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"]
+SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"]
TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ]
WOODSTOX = "woodstox:wstx-asl:jar:3.2.1"
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1"
Modified: ode/trunk/jbi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/ode/trunk/jbi-bundle/pom.xml?rev=1055992&r1=1055991&r2=1055992&view=diff
==============================================================================
--- ode/trunk/jbi-bundle/pom.xml (original)
+++ ode/trunk/jbi-bundle/pom.xml Thu Jan 6 18:26:32 2011
@@ -126,5 +126,20 @@ src/main/resources,
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
</project>
Modified: ode/trunk/jbi-karaf/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/ode/trunk/jbi-karaf/src/main/resources/features.xml?rev=1055992&r1=1055991&r2=1055992&view=diff
==============================================================================
--- ode/trunk/jbi-karaf/src/main/resources/features.xml (original)
+++ ode/trunk/jbi-karaf/src/main/resources/features.xml Thu Jan 6 18:26:32 2011
@@ -23,7 +23,7 @@
<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>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_1</bundle>
</feature>
<feature name="ode-core" version="${ode.version}">
<bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
@@ -69,6 +69,9 @@
<feature version="${ode.version}">ode-core-deps</feature>
<feature version="${ode.version}">ode-core</feature>
</feature>
+ <feature name="ode-commands" version="${ode.version}">
+
<bundle>mvn:org.apache.ode/ode-jbi-karaf-commands/${ode.version}</bundle>
+ </feature>
<feature name="examples-ode-ping-pong" version="${ode.version}">
<feature version="${ode.version}">ode</feature>
<bundle>mvn:org.apache.ode.examples/ping-pong-bundle/${ode.version}</bundle>
