You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/09/27 13:32:51 UTC
svn commit: r1176334 -
/karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Author: jbonofre
Date: Tue Sep 27 11:32:51 2011
New Revision: 1176334
URL: http://svn.apache.org/viewvc?rev=1176334&view=rev
Log:
[KARAF-889] Fix dev:framework command workflow
Modified:
karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
Modified: karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java?rev=1176334&r1=1176333&r2=1176334&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java (original)
+++ karaf/branches/karaf-2.2.x/shell/dev/src/main/java/org/apache/karaf/shell/dev/FrameworkOptions.java Tue Sep 27 11:32:51 2011
@@ -51,25 +51,32 @@ public class FrameworkOptions extends Os
System.out.printf("Current OSGi framework is %s%n", getFramework().getName());
return null;
}
- if (debug) {
- Framework frwk = getFramework();
- System.out.printf("Enabling debug for OSGi framework (%s)%n", frwk.getName());
- frwk.enableDebug(new File(KARAF_BASE));
- }
- if (nodebug) {
- Framework frwk = getFramework();
- System.out.printf("Disabling debug for OSGi framework (%s)%n", frwk.getName());
- frwk.disableDebug(new File(KARAF_BASE));
- }
+ Framework frwk = null;
if (framework != null) {
if (!Felix.NAME.equalsIgnoreCase(framework) && !Equinox.NAME.equalsIgnoreCase(framework)) {
System.err.printf("Unsupported framework: %s%n", framework);
return null;
}
+ if (Felix.NAME.equalsIgnoreCase(framework))
+ frwk = new Felix(new File(KARAF_BASE));
+ else
+ frwk = new Equinox(new File(KARAF_BASE));
Properties props = new Properties(new File(System.getProperty("karaf.base"), "etc/config.properties"));
props.put("karaf.framework", framework.toLowerCase());
props.save();
}
+ if (debug) {
+ if (frwk == null)
+ frwk = getFramework();
+ System.out.printf("Enabling debug for OSGi framework (%s)%n", frwk.getName());
+ frwk.enableDebug(new File(KARAF_BASE));
+ }
+ if (nodebug) {
+ if (frwk == null)
+ frwk = getFramework();
+ System.out.printf("Disabling debug for OSGi framework (%s)%n", frwk.getName());
+ frwk.disableDebug(new File(KARAF_BASE));
+ }
return null;
}