# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1360952674 -3600
# Node ID 1343f52164f3bdf816e81d9f75378580ecb72988
# Parent  d3220b78c21aac4d1fe1ed4188dcf04085bbc4a1
Rewriting the (dynamic) calculator demo to be able to reference JARs, but load from a server

diff -r d3220b78c21a -r 1343f52164f3 javaquery/demo-calculator-dynamic/pom.xml
--- a/javaquery/demo-calculator-dynamic/pom.xml	Fri Feb 15 19:21:40 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/pom.xml	Fri Feb 15 19:24:34 2013 +0100
@@ -40,14 +40,47 @@
                <target>1.7</target>
             </configuration>
          </plugin>
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-jar-plugin</artifactId>
+             <version>2.4</version>
+             <configuration>
+                 <archive>
+                     <manifest>
+                         <addClasspath>true</addClasspath>
+                         <classpathPrefix>lib/</classpathPrefix>
+                         <mainClass>org.apidesign.bck2brwsr.demo.calc.staticcompilation.Calc</mainClass>
+                     </manifest>
+                 </archive>
+             </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>distro-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>                
+            </plugin>      
       </plugins>
   </build>
 
   <dependencies>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>emul.mini</artifactId>
+      <artifactId>emul</artifactId>
       <version>0.3-SNAPSHOT</version>
+      <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
@@ -60,5 +93,13 @@
       <version>6.5.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>vm4brwsr</artifactId>
+      <classifier>js</classifier>
+      <type>zip</type>
+      <version>0.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
diff -r d3220b78c21a -r 1343f52164f3 javaquery/demo-calculator-dynamic/src/main/assembly/bck2brwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/demo-calculator-dynamic/src/main/assembly/bck2brwsr.xml	Fri Feb 15 19:24:34 2013 +0100
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  
+  <id>bck2brwsr</id>
+  <formats>
+      <format>zip</format>
+      <format>dir</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <dependencySets>
+    <dependencySet>
+        <useProjectArtifact>false</useProjectArtifact>
+        <scope>runtime</scope>
+        <outputDirectory>lib</outputDirectory>
+        <includes>
+            <include>*:jar</include>
+            <include>*:rt</include>
+        </includes>
+    </dependencySet>
+    <dependencySet>
+        <useProjectArtifact>false</useProjectArtifact>
+        <scope>provided</scope>
+        <includes>
+            <include>*:js</include>
+        </includes>
+        <unpack>true</unpack>
+        <outputDirectory>/</outputDirectory>
+    </dependencySet>
+  </dependencySets> 
+  <files>
+    <file>
+      <source>${project.build.directory}/${project.build.finalName}.jar</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/classes/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>index.xhtml</destName>
+    </file>
+  </files>
+
+</assembly>
\ No newline at end of file
diff -r d3220b78c21a -r 1343f52164f3 javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml
--- a/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml	Fri Feb 15 19:21:40 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml	Fri Feb 15 19:24:34 2013 +0100
@@ -78,9 +78,9 @@
         </table>
         <div data-bind="text: displayPreview"></div>
         
-        <script src="/bck2brwsr.js"></script>
-        <script src="/vm.js"></script>
+        <script src="bck2brwsr.js"></script>
         <script type="text/javascript">
+            var vm = bck2brwsr('demo.calculator-0.3-SNAPSHOT.jar');
             vm.loadClass('org.apidesign.bck2brwsr.demo.calc.Calc');
         </script>
         
diff -r d3220b78c21a -r 1343f52164f3 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Feb 15 19:21:40 2013 +0100
+++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Feb 15 19:24:34 2013 +0100
@@ -95,9 +95,10 @@
             startpage = "/" + startpage;
         }
         HttpServer s = initServer(".", true);
+        s.getServerConfiguration().addHttpHandler(new Page(resources, startpage), "/index.xhtml");
         s.getServerConfiguration().addHttpHandler(new Page(resources, null), "/");
         try {
-            launchServerAndBrwsr(s, startpage);
+            launchServerAndBrwsr(s, "/index.xhtml");
         } catch (URISyntaxException | InterruptedException ex) {
             throw new IOException(ex);
         }
@@ -139,7 +140,7 @@
 
         final ServerConfiguration conf = s.getServerConfiguration();
         if (addClasses) {
-            conf.addHttpHandler(new VM(resources), "/vm.js");
+            conf.addHttpHandler(new VM(resources), "/bck2brwsr.js");
             conf.addHttpHandler(new Classes(resources), "/classes/");
         }
         return s;
@@ -450,9 +451,9 @@
             String r = resource;
             if (r == null) {
                 r = request.getHttpHandlerPath();
-                if (r.startsWith("/")) {
-                    r = r.substring(1);
-                }
+            }
+            if (r.startsWith("/")) {
+                r = r.substring(1);
             }
             String[] replace = {};
             if (r.endsWith(".html")) {
@@ -483,14 +484,19 @@
             StringBuilder sb = new StringBuilder();
             Bck2Brwsr.generate(sb, loader);
             sb.append(
-                "function ldCls(res) {\n"
-                + "  var request = new XMLHttpRequest();\n"
-                + "  request.open('GET', '/classes/' + res, false);\n"
-                + "  request.send();\n"
-                + "  var arr = eval('(' + request.responseText + ')');\n"
-                + "  return arr;\n"
-                + "}\n"
-                + "var vm = new bck2brwsr(ldCls);\n"
+                  "(function WrapperVM(global) {"
+                + "  function ldCls(res) {\n"
+                + "    var request = new XMLHttpRequest();\n"
+                + "    request.open('GET', '/classes/' + res, false);\n"
+                + "    request.send();\n"
+                + "    var arr = eval('(' + request.responseText + ')');\n"
+                + "    return arr;\n"
+                + "  }\n"
+                + "  var prevvm = global.bck2brwsr;\n"
+                + "  global.bck2brwsr = function() {\n"
+                + "    return prevvm(ldCls);\n"
+                + "  };\n"
+                + "})(this);\n"
             );
             this.bck2brwsr = sb.toString();
         }