diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java b/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java index 1018cefe67732dd460f9d00303b711ce437483ca..eb71f70e0845ff65b4c84b79dfd011af9f1f229c 100644 --- a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java +++ b/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java @@ -60,15 +60,29 @@ public class IndexServlet extends URLHttpServlet { "wget <a href=\"" + addr + "/files/dist-tlc.zip\">" + addr + "/files/dist-tlc.zip</a>\n" + "unzip dist-tlc.zip\n" + "cd disttlc/\n" + - "java -Djava.rmi.server.hostname=" + remoteAddr + " -Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + url.getHost() + ":10997 -jar dist-tlc.jar " + - "\n</pre>\n" + + "java -Djava.rmi.server.hostname=" + + remoteAddr + + " -Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + + url.getHost() + + ":10997 " +// + "-Dorg.lamport.tla.distributed.consumer.DistributedFPSetConsumer.uri=rmi://" +// + url.getHost() + ":10997 " + + "-jar dist-tlc.jar " + + "\n</pre>\n" + // Windows Powershell 2.0 with manually created C:\\tmp folder ($env:temp does not seem to work) and x86 Java installed in default location "<h4>Windows Powershell 2.0:</h4>" + "<pre>\n" + "(new-object System.Net.WebClient).DownloadFile(\"" + addr + "/files/dist-tlc.zip\", \"C:\\tmp\\dist-tlc.zip\")\n" + "(new-object -com shell.application).namespace(\"C:\\tmp\").CopyHere((new-object -com shell.application).namespace(\"C:\\tmp\\dist-tlc.zip\").Items(),16)\n" + - "& 'C:\\Program Files (x86)\\Java\\jre7\\bin\\java.exe' \"-Djava.rmi.server.hostname=" + remoteAddr + "\" \"-Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + url.getHost() + ":10997\" -jar C:\\tmp\\disttlc\\dist-tlc.jar" + - "\n</pre>\n" + + "& 'C:\\Program Files (x86)\\Java\\jre7\\bin\\java.exe' \"-Djava.rmi.server.hostname=" + + remoteAddr + + "\" \"-Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + + url.getHost() + + ":10997\" " +// + "\"-Dorg.lamport.tla.distributed.consumer.DistributedFPSetConsumer.uri=rmi://" +// + url.getHost() + ":10997\" " + + "-jar C:\\tmp\\disttlc\\dist-tlc.jar" + + "\n</pre>\n" + "</li>"); resp.getWriter().println( "</ul>\n" + diff --git a/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml b/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml index 0577c426faaa3e041bb69e47939f6639b239aba1..e9c50d24db99d2729b1f23b9d8cc2e6943737058 100644 --- a/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml +++ b/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.lamport.tlatools.consumer.distributed.fpset"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="false" name="org.lamport.tlatools.consumer.distributed.fpset"> <implementation class="org.lamport.tla.distributed.consumer.DistributedFPSetConsumer"/> <reference bind="setIDistributedFPSet" cardinality="1..1" interface="tlc2.IDistributedFPSet" name="IDistributedFPSet" policy="static" unbind="unsetIDistributedFPSet"/> </scr:component>