Author: kono
Date: 2012-10-08 13:25:09 -0700 (Mon, 08 Oct 2012)
New Revision: 30625
Modified:
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/cytoscape.sh
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/gen_vmoptions.sh
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/custom.properties
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
core3/gui-distribution/branches/user-beta1/packaging/src/main/install4j/Cytoscape.install4j
Log:
Unix and Windows installer bug fixes had been merged.
Modified:
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/cytoscape.sh
===================================================================
---
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/cytoscape.sh
2012-10-08 19:10:06 UTC (rev 30624)
+++
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/cytoscape.sh
2012-10-08 20:25:09 UTC (rev 30625)
@@ -25,12 +25,13 @@
"$script_path/gen_vmoptions.sh"
fi
+JAVA_MAX_MEM=-Xmx1550M
if [ -r $vm_options_path/Cytoscape.vmoptions ]; then
- export JAVA_MAX_MEM=`cat $vm_options_path/Cytoscape.vmoptions`
+ JAVA_MAX_MEM=`cat $vm_options_path/Cytoscape.vmoptions`
else # Just use sensible defaults.
echo '*** Missing Cytoscape.vmoptions, falling back to using defaults!'
# Initialize MAX_MEM to something reasonable
- export JAVA_MAX_MEM=1550M
+ JAVA_MAX_MEM=-Xmx1550M
fi
# The Cytoscape home directory contains the "framework" directory
@@ -43,7 +44,7 @@
# working directory since KARAF changes it to the framework directory. There
# might unforeseeable problems with this since the reason for KARAF setting
the
# working directory to framework is not known.
-export KARAF_OPTS=-Xss10M\ -Duser.dir="$PWD"\
-Dcytoscape.home="$CYTOSCAPE_HOME_ABS"\ -splash:CytoscapeSplashScreen.png\
"$CYTOSCAPE_MAC_OPTS"
+export KARAF_OPTS=-Xss10M\ $JAVA_MAX_MEM\ -Duser.dir="$PWD"\
-Dcytoscape.home="$CYTOSCAPE_HOME_ABS"\ -splash:CytoscapeSplashScreen.png\
"$CYTOSCAPE_MAC_OPTS"
export KARAF_DATA="${HOME}/CytoscapeConfiguration/3/karaf_data"
mkdir -p "${KARAF_DATA}/tmp"
Modified:
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/gen_vmoptions.sh
===================================================================
---
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/gen_vmoptions.sh
2012-10-08 19:10:06 UTC (rev 30624)
+++
core3/gui-distribution/branches/user-beta1/assembly/src/main/bin/gen_vmoptions.sh
2012-10-08 20:25:09 UTC (rev 30625)
@@ -30,14 +30,14 @@
fi
if `java -version 2>&1 | grep -- 64-Bit > /dev/null`; then # We have a 64 bit
JVM.
- echo ${mem}M > "$vm_options_path/Cytoscape.vmoptions"
+ echo "-Xmx"${mem}M > "$vm_options_path/Cytoscape.vmoptions"
else # Assume a 32 bit JVM.
# Truncate memory setting at 1550 MiB:
if [ $mem -gt 1550 ]; then
mem=1550
fi
- echo ${mem}M > "$vm_options_path/Cytoscape.vmoptions"
+ echo "-Xmx"${mem}M > "$vm_options_path/Cytoscape.vmoptions"
fi
exit 0
Modified:
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/custom.properties
===================================================================
---
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/custom.properties
2012-10-08 19:10:06 UTC (rev 30624)
+++
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/custom.properties
2012-10-08 20:25:09 UTC (rev 30625)
@@ -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/branches/user-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
===================================================================
---
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
2012-10-08 19:10:06 UTC (rev 30624)
+++
core3/gui-distribution/branches/user-beta1/assembly/src/main/resources/etc/org.apache.felix.fileinstall-deploy.cfg
2012-10-08 20:25:09 UTC (rev 30625)
@@ -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/branches/user-beta1/packaging/src/main/install4j/Cytoscape.install4j
===================================================================
---
core3/gui-distribution/branches/user-beta1/packaging/src/main/install4j/Cytoscape.install4j
2012-10-08 19:10:06 UTC (rev 30624)
+++
core3/gui-distribution/branches/user-beta1/packaging/src/main/install4j/Cytoscape.install4j
2012-10-08 20:25:09 UTC (rev 30625)
@@ -66,7 +66,7 @@
<versionLine x="20" y="40" text="version ${compiler:sys.version}"
font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
</text>
</splashScreen>
- <java mainClass="org.cytoscape.launcher.internal.Launcher"
vmParameters="-Xss10M -Xms128M -Xmx1G -Dcom.sun.management.jmxremote
"-Dkaraf.instances=${launcher:sys.launcherDirectory}/framework/instances"
" -Dkaraf.home=${launcher:sys.launcherDirectory}/framework"
"-Dkaraf.base=${launcher:sys.launcherDirectory}/framework" "
-Djava.util.logging.config.file=${launcher:sys.launcherDirectory}/framework/etc/java.util.logging.properties"
-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false" arguments=""
allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
+ <java mainClass="org.cytoscape.launcher.internal.Launcher"
vmParameters="-Xss10M -Xms128M -Xmx1G -Dcom.sun.management.jmxremote
"-Dkaraf.instances=${launcher:sys.launcherDirectory}/framework/instances"
"-Dkaraf.home=${launcher:sys.launcherDirectory}/framework"
"-Dkaraf.base=${launcher:sys.launcherDirectory}/framework"
"-Djava.util.logging.config.file=${launcher:sys.launcherDirectory}/framework/etc/java.util.logging.properties"
-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false" arguments=""
allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
<classPath>
<scanDirectory location="." failOnError="false" />
<directory location="lib" failOnError="false" />
--
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.
