Revision: 4409
http://vexi.svn.sourceforge.net/vexi/?rev=4409&view=rev
Author: mkpg2
Date: 2012-06-27 07:33:34 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Fix. Set biscuitid as a vexi core argument not an application parameter.
Modified Paths:
--------------
trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
trunk/org.vexi-core.main/src/main/java/org/vexi/core/Resources.java
trunk/org.vexi-launcher/src/main/java/org/vexi/launcher/Launcher.java
Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
2012-06-27 07:03:45 UTC (rev 4408)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
2012-06-27 07:33:34 UTC (rev 4409)
@@ -120,7 +120,8 @@
//" -w <window-id> reserved for libvexi\n"+
//" -p dump profiling information [not yet
supported]"+
" -hr 'hot replace' updated templates whilst
running"+
- " -debug start with vexi.debug set to true";
+ " -debug start with vexi.debug set to true"+
+ " -biscuitid <id> sets biscuitid, which is used to uniquely
identify the vexi program and its biscuits";
}
public void start(String[] args) throws Exception{
@@ -141,6 +142,9 @@
hotreplace = true;
} else if (args[startargs].equals("-debug")) {
debug = true;
+ } else if (args[startargs].equals("-biscuitid")) {
+ startargs++;
+ Resources.biscuitid = args[startargs];
} else if (args[startargs].equals("-t")) {
startargs++;
startupTemplate = args[startargs];
Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/core/Resources.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/core/Resources.java
2012-06-27 07:03:45 UTC (rev 4408)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/core/Resources.java
2012-06-27 07:33:34 UTC (rev 4409)
@@ -286,10 +286,10 @@
return path.replace('/', '_').replace('\\', '_').replace(':',
'_').replace('?', '_');
}
+ static public String biscuitid = "default";
/* JS Interface for accessing the biscuits */
public static final JS biscuits = new JS.Immutable() {
public JS get(JS key) throws JSExn {
- String biscuitid = System.getProperty("biscuitid","default");
String filename = biscuitid + "_" + JSU.toString(key);
File biscuitsDir = dotvexi.findSubDir("biscuits");
Fountain f = new Fountain.File(biscuitsDir.getPath() + "/" +
filename);
Modified: trunk/org.vexi-launcher/src/main/java/org/vexi/launcher/Launcher.java
===================================================================
--- trunk/org.vexi-launcher/src/main/java/org/vexi/launcher/Launcher.java
2012-06-27 07:03:45 UTC (rev 4408)
+++ trunk/org.vexi-launcher/src/main/java/org/vexi/launcher/Launcher.java
2012-06-27 07:33:34 UTC (rev 4409)
@@ -357,6 +357,8 @@
command.add("-l");
command.add("logs/"+logfile);
}
+ command.add("-biscuitid");
+ command.add(DotVexi.urlUniqueName(codebase));
for (int i = 0; i<10000;i++) {
@@ -366,7 +368,6 @@
command.add(getParameter("option" + i));
}
- command.add("biscuitid="+DotVexi.urlUniqueName(codebase));
for (int i = 0; i<fetchVexis.size();i++) {
File f = fetch((String)fetchVexis.get(i));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
