Author: jm
Date: 2011-10-21 07:52:36 -0700 (Fri, 21 Oct 2011)
New Revision: 27262
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.bat
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.sh
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/system.properties
Log:
Moved start up properties out of start up scripts and into system.properties
Fixed references to feature repository
Fixed Windows launcher
Modified: csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-21
00:47:37 UTC (rev 27261)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/pom.xml 2011-10-21
14:52:36 UTC (rev 27262)
@@ -108,7 +108,6 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.cytoscape.distribution/features/${project.version}/xml/features</descriptor>
</descriptors>
<features>
@@ -126,8 +125,7 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
-
<descriptor>mvn:org.cytoscape/features/${project.version}/xml/features</descriptor>
+
<descriptor>mvn:org.cytoscape.distribution/features/${project.version}/xml/features</descriptor>
</descriptors>
<features/>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
Added:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.bat
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.bat
(rev 0)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.bat
2011-10-21 14:52:36 UTC (rev 27262)
@@ -0,0 +1,11 @@
+@echo off
+
+set KARAF_TITLE=Cytoscape
+set DEBUG_PORT=12345
+
+set JAVA_MAX_MEM=1550M
+
+set JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=%DEBUG_PORT%
+set KARAF_OPTS=-Xss10M -splash:CytoscapeSplashScreen.png
+
+framework/bin/karaf client %1 %2 %3 %4 %5 %6 %7 %8
Property changes on:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.bat
___________________________________________________________________
Added: svn:executable
+ *
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.sh
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.sh
2011-10-21 00:47:37 UTC (rev 27261)
+++ csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/bin/cytoscape.sh
2011-10-21 14:52:36 UTC (rev 27262)
@@ -1,5 +1,12 @@
#!/bin/bash
+DEBUG_PORT=12345
+
cd $(dirname $0)
-export KARAF_OPTS="-splash:CytoscapeSplashScreen.png"
-framework/bin/karaf
+
+export JAVA_MAX_MEM=1550M
+
+export JAVA_DEBUG_OPTS="Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${DEBUG_PORT}"
+export KARAF_OPTS="-Xss10M -splash:CytoscapeSplashScreen.png"
+
+framework/bin/karaf client "$@"
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
2011-10-21 00:47:37 UTC (rev 27261)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
2011-10-21 14:52:36 UTC (rev 27262)
@@ -1,2 +1,2 @@
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.cytoscape/features/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.cytoscape.distribution/features/${project.version}/xml/features
featuresBoot=cytoscape-gui
Modified:
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/system.properties
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/system.properties
2011-10-21 00:47:37 UTC (rev 27261)
+++
csplugins/trunk/toronto/jm/cykaraf/distribution/src/main/filtered-resources/etc/system.properties
2011-10-21 14:52:36 UTC (rev 27262)
@@ -1,4 +1,10 @@
karaf.name=Cytoscape ${project.version}
karaf.default.repository=system
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
\ No newline at end of file
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+
+awt.useSystemAAFontSettings=lcd
+apple.laf.useScreenMenuBar=true
+apple.awt.rendering=speed
+apple.awt.fileDialogForDirectories=true
+com.apple.mrj.application.apple.menu.about.name=Cytoscape
--
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.
