Author: kono
Date: 2012-10-03 17:13:57 -0700 (Wed, 03 Oct 2012)
New Revision: 30604

Modified:
   
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/custom.properties
   
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
   
core3/gui-distribution/tags/parent-3.0.0-beta1/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
Log:
Patched to fix Config directory problem.

Modified: 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/custom.properties
===================================================================
--- 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/custom.properties
    2012-10-04 00:12:41 UTC (rev 30603)
+++ 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/custom.properties
    2012-10-04 00:13:57 UTC (rev 30604)
@@ -1,5 +1,4 @@
 karaf.systemBundlesStartLevel=99
 karaf.startlevel.bundle=200
-org.osgi.framework.startlevel.beginning=200
 org.osgi.framework.system.packages.extra = 
org.apache.karaf.branding,org.cytoscape.launcher.internal,com.sun.xml.internal.bind,com.apple.eawt;
 org.osgi.framework.bootdelegation=org.netbeans.lib.profiler.*
\ No newline at end of file

Modified: 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
===================================================================
--- 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
      2012-10-04 00:12:41 UTC (rev 30603)
+++ 
core3/gui-distribution/tags/parent-3.0.0-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
      2012-10-04 00:13:57 UTC (rev 30604)
@@ -1,3 +1,4 @@
 felix.fileinstall.dir = ${user.home}/CytoscapeConfiguration/3/apps/installed
 felix.fileinstall.tmpdir  = ${karaf.data}/generated-bundles
 felix.fileinstall.poll    = 1000
+felix.fileinstall.active.level = 200
\ No newline at end of file

Modified: 
core3/gui-distribution/tags/parent-3.0.0-beta1/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
===================================================================
--- 
core3/gui-distribution/tags/parent-3.0.0-beta1/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
 2012-10-04 00:12:41 UTC (rev 30603)
+++ 
core3/gui-distribution/tags/parent-3.0.0-beta1/launcher/src/main/java/org/cytoscape/launcher/internal/Launcher.java
 2012-10-04 00:13:57 UTC (rev 30604)
@@ -1,5 +1,7 @@
 package org.cytoscape.launcher.internal;
 
+import java.io.File;
+
 import org.apache.karaf.main.Main;
 
 public class Launcher {
@@ -7,9 +9,16 @@
 
        public static void main(String[] args) throws Exception {
                startupArguments = args;
+               createConfigurationDirectory();
                Main.main(args);
        }
        
+       private static void createConfigurationDirectory() {
+               String userHome = System.getProperty("user.home");
+               File karafData = new File(userHome, String.format("%s%s%s", 
"CytoscapeConfiguration", File.separator, "3"));
+               karafData.mkdirs();
+       }
+
        public static String[] getStartupArguments() {
                String[] result = new String[startupArguments.length];
                System.arraycopy(startupArguments, 0, result, 0, 
startupArguments.length);

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to