You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2011/01/12 16:45:27 UTC
svn commit: r1058199 - in /ode/trunk: Rakefile dependencies.rb jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml

Author: vanto
Date: Wed Jan 12 15:45:26 2011
New Revision: 1058199

URL: http://svn.apache.org/viewvc?rev=1058199&view=rev
Log:
ixing ODE-903: upgrade commands to Karaf 2.1.3.

Modified:
    ode/trunk/Rakefile
    ode/trunk/dependencies.rb
    ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
    ode/trunk/jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml

Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=1058199&r1=1058198&r2=1058199&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Wed Jan 12 15:45:26 2011
@@ -457,7 +457,7 @@ define "ode" do
       bnd['Bundle-Name'] = "Apache ODE :: Commands"
       bnd['Bundle-Version'] = VERSION_NUMBER
       bnd['Require-Bundle'] = "org.apache.ode.ode-jbi-bundle;version=#{VERSION_NUMBER}"
-      bnd['Import-Package'] = "org.osgi.service.command,*"
+      bnd['Import-Package'] = 'org.osgi.service.command,org.apache.karaf.shell.console;version="[2.0,2.1)",*'
       bnd['Private-Package'] = "org.apache.ode.karaf.commands;version=#{VERSION_NUMBER}"
       bnd['Include-Resource'] = _('src/main/resources')
     end

Modified: ode/trunk/dependencies.rb
URL: http://svn.apache.org/viewvc/ode/trunk/dependencies.rb?rev=1058199&r1=1058198&r2=1058199&view=diff
==============================================================================
--- ode/trunk/dependencies.rb (original)
+++ ode/trunk/dependencies.rb Wed Jan 12 15:45:26 2011
@@ -93,9 +93,9 @@ JIBX                = "jibx:jibx-run:jar
 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",
+                        "org.apache.karaf.shell:org.apache.karaf.shell.console:jar:2.1.3",
                         group("org.apache.felix.gogo.commands","org.apache.felix.gogo.runtime",
-                          :under=>"org.apache.felix.gogo", :version=>"0.2.0")
+                          :under=>"org.apache.felix.gogo", :version=>"0.4.0")
                       ]
 LOG4J               = "log4j:log4j:jar:1.2.13"
 OPENJPA             = ["org.apache.openjpa:openjpa:jar:1.2.1",

Modified: ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java?rev=1058199&r1=1058198&r2=1058199&view=diff
==============================================================================
--- ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java (original)
+++ ode/trunk/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java Wed Jan 12 15:45:26 2011
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.management.*;
 
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.ode.bpel.pmapi.*;
 import org.apache.ode.jbi.OdeContext;
 

Modified: ode/trunk/jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml?rev=1058199&r1=1058198&r2=1058199&view=diff
==============================================================================
--- ode/trunk/jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml (original)
+++ ode/trunk/jbi-karaf-commands/src/main/resources/OSGI-INF/blueprint/ode-commands.xml Wed Jan 12 15:45:26 2011
@@ -16,7 +16,7 @@
      limitations under the License.
   -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-    xmlns:shell="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    xmlns:shell="http://karaf.apache.org/xmlns/shell/v1.0.0">
 
     <shell:command-bundle>
         <shell:command name="ode/list">