# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1356332685 -3600
# Node ID 5751fe604e6b3e726cc594fb11bcf0e055f1bdff
# Parent  e5b4bd29f26827365f54f2a7f528edcfd347c0f2
Keeping old name for static demo-calculator, as its build products are referenced by Hudson jobs

diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator-dynamic/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/demo-calculator-dynamic/nbactions.xml	Mon Dec 24 08:04:45 2012 +0100
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<actions>
+        <action>
+            <actionName>run</actionName>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.apidesign.bck2brwsr:mojo:0.3-SNAPSHOT:brwsr</goal>
+            </goals>
+        </action>
+    </actions>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator-dynamic/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/demo-calculator-dynamic/pom.xml	Mon Dec 24 08:04:45 2012 +0100
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>demo.calculator</artifactId>
+  <version>0.3-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>JavaQuery Demo - Calculator</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+      <plugins>
+            <plugin>
+                <groupId>org.apidesign.bck2brwsr</groupId>
+                <artifactId>mojo</artifactId>
+                <version>0.3-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>brwsr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <startpage>org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml</startpage>
+                </configuration>
+            </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+      </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>emul</artifactId>
+      <version>0.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>javaquery.api</artifactId>
+      <version>0.3-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java	Mon Dec 24 08:04:45 2012 +0100
@@ -0,0 +1,88 @@
+/**
+ * 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.
+ */
+package org.apidesign.bck2brwsr.mavenhtml;
+
+import org.apidesign.bck2brwsr.htmlpage.api.OnClick;
+import org.apidesign.bck2brwsr.htmlpage.api.Page;
+
+/** HTML5 & Java demo showing the power of 
+ * <a href="http://wiki.apidesign.org/wiki/AnnotationProcessor">annotation processors</a>
+ * as well as other goodies.
+ * 
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ */
+@Page(xhtml="Calculator.xhtml")
+public class App {
+    private static double memory;
+    private static String operation;
+    
+    @OnClick(id="clear")
+    static void clear() {
+        memory = 0;
+        operation = null;
+        Calculator.DISPLAY.setValue("0");
+    }
+    
+    @OnClick(id= { "plus", "minus", "mul", "div" })
+    static void applyOp(String op) {
+        memory = getValue();
+        operation = op;
+        Calculator.DISPLAY.setValue("0");
+    }
+    
+    @OnClick(id="result")
+    static void computeTheValue() {
+        switch (operation) {
+            case "plus": setValue(memory + getValue()); break;
+            case "minus": setValue(memory - getValue()); break;
+            case "mul": setValue(memory * getValue()); break;
+            case "div": setValue(memory / getValue()); break;
+            default: throw new IllegalStateException(operation);
+        }
+    }
+    
+    @OnClick(id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
+    static void addDigit(String digit) {
+        digit = digit.substring(1);
+        String v = Calculator.DISPLAY.getValue();
+        if (getValue() == 0.0) {
+            Calculator.DISPLAY.setValue(digit);
+        } else {
+            Calculator.DISPLAY.setValue(v + digit);
+        }
+    }
+    
+    private static void setValue(double v) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(v);
+        if (sb.toString().endsWith(".0")) {
+            final int l = sb.length();
+            sb.delete(l - 2, l);
+        }
+        Calculator.DISPLAY.setValue(sb.toString());
+    }
+
+    private static double getValue() {
+        try {
+            return Double.parseDouble(Calculator.DISPLAY.getValue());
+        } catch (NumberFormatException ex) {
+            Calculator.DISPLAY.setValue("err");
+            return 0.0;
+        }
+    }
+}
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml	Mon Dec 24 08:04:45 2012 +0100
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Simple Calculator in HTML5 and Java</title>
+
+        <style type="text/css">
+        body {color: #ffffff; background-color: #121e31; font-family: Monospaced}
+        pre {color: #ffffff; background-color: #121e31; font-family: Monospaced}
+        table {color: #ffffff; background-color: #121e31; font-family: Monospaced}
+        .string {color: #e2ce00}
+        a {color: #e2ce00}
+        .ST1 {color: #0000cc; font-family: Monospaced; font-weight: bold}
+        .ST0 {color: #0000ff}
+        .comment {color: #428bdd}
+        .keyword-directive {color: #f8bb00}
+        .tag {color: #f8bb00}
+        .ST0 {color: #628fb5; background-color: #1b3450}
+        .sgml-comment {color: #808080}
+        .value {color: #99006b}
+        .argument {color: #007c00}
+        .sgml-declaration {color: #bf9221}
+        </style>    
+        </head>
+    <body>
+        <h1>Java and HTML5 - Together at Last!</h1>
+        <table border="0" cellspacing="2">
+            <tbody>
+                <tr>
+                    <td colspan="4"><input id="display" value="0" 
+                            style="text-align: right"/>
+                </td>
+                </tr>
+                <tr>
+                    <td><button id="n1">1</button></td>
+                    <td><button id="n2">2</button></td>
+                    <td><button id="n3">3</button></td>
+                    <td><button id="plus">+</button></td>
+                </tr>
+                <tr>
+                    <td><button id="n4">4</button></td>
+                    <td><button id="n5">5</button></td>
+                    <td><button id="n6">6</button></td>
+                    <td><button id="minus">-</button></td>
+                </tr>
+                <tr>
+                    <td><button id="n7">7</button></td>
+                    <td><button id="n8">8</button></td>
+                    <td><button id="n9">9</button></td>
+                    <td><button id="mul">*</button></td>
+                </tr>
+                <tr>
+                    <td><button id="clear">C</button></td>
+                    <td><button id="n0">0</button></td>
+                    <td><button id="result">=</button></td>
+                    <td><button id="div">/</button></td>
+                </tr>
+            </tbody>
+        </table>
+
+        <script src="/bck2brwsr.js"></script>
+        <script src="/vm.js"></script>
+        <script type="text/javascript">
+            vm.loadClass('org.apidesign.bck2brwsr.mavenhtml.Calculator');
+        </script>
+        
+        <hr/>
+    <pre>
+    <span class="keyword-directive">package</span> org.apidesign.bck2brwsr.mavenhtml;
+
+    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.OnClick;
+    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.Page;
+
+    <span class="comment">/**</span> <span class="comment">HTML5</span><span class="comment"> &amp; </span><span class="comment">Java</span> <span class="comment">demo</span> <span class="comment">showing</span> <span class="comment">the</span> <span class="comment">power</span> <span class="comment">of</span> <a href="http://wiki.apidesign.org/wiki/AnnotationProcessor">annotation processors</a>
+    <span class="comment"> * </span><span class="comment">as</span> <span class="comment">well</span> <span class="comment">as</span> <span class="comment">other</span> <span class="comment">goodies</span><span class="comment">, including type-safe association between</span>
+    <span class="comment"> * </span><span class="comment">an XHTML page and Java.</span>
+    <span class="comment"> * </span>
+    <span class="comment"> * </span><span class="ST1">@author</span> <span class="comment">Jaroslav</span> <span class="comment">Tulach</span> <span class="ST0">&lt;jaroslav.tulach@apidesign.org&gt;</span>
+     <span class="comment">*/</span>
+    @Page(xhtml=<span class="string">&quot;</span><span class="string">Calculator.xhtml</span><span class="string">&quot;</span>)
+    <span class="keyword-directive">public</span> <span class="keyword-directive">class</span> App {
+        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> memory;
+        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> String operation;
+
+        @OnClick(id=<span class="string">&quot;</span><span class="string">clear</span><span class="string">&quot;</span>)
+        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> clear() {
+            memory = <span class="number">0</span>;
+            operation = <span class="keyword-directive">null</span>;
+            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
+        }
+
+        @OnClick(id= { <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span> })
+        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> applyOp(String op) {
+            memory = getValue();
+            operation = op;
+            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
+        }
+
+        @OnClick(id=<span class="string">&quot;</span><span class="string">result</span><span class="string">&quot;</span>)
+        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> computeTheValue() {
+            <span class="keyword-directive">switch</span> (operation) {
+                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>: setValue(memory + getValue()); <span class="keyword-directive">break</span>;
+                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>: setValue(memory - getValue()); <span class="keyword-directive">break</span>;
+                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>: setValue(memory * getValue()); <span class="keyword-directive">break</span>;
+                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span>: setValue(memory / getValue()); <span class="keyword-directive">break</span>;
+                <span class="keyword-directive">default</span>: <span class="keyword-directive">throw</span> <span class="keyword-directive">new</span> IllegalStateException(operation);
+            }
+        }
+
+        @OnClick(id={<span class="string">&quot;</span><span class="string">n0</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n1</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n2</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n3</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n4</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n5</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n6</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n7</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n8</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n9</span><span class="string">&quot;</span>}) 
+        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> addDigit(String digit) {
+            digit = digit.substring(<span class="number">1</span>);
+            String v = Calculator.DISPLAY.getValue();
+            <span class="keyword-directive">if</span> (getValue() == <span class="number">0.0</span>) {
+                Calculator.DISPLAY.setValue(digit);
+            } <span class="keyword-directive">else</span> {
+                Calculator.DISPLAY.setValue(v + digit);
+            }
+        }
+
+        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> setValue(<span class="keyword-directive">double</span> v) {
+            StringBuilder sb = <span class="keyword-directive">new</span> StringBuilder();
+            sb.append(v);
+            Calculator.DISPLAY.setValue(sb.toString());
+        }
+
+        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> getValue() {
+            <span class="keyword-directive">try</span> {
+                <span class="keyword-directive">return</span> Double.parseDouble(Calculator.DISPLAY.getValue());
+            } <span class="keyword-directive">catch</span> (NumberFormatException ex) {
+                Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">err</span><span class="string">&quot;</span>);
+                <span class="keyword-directive">return</span> <span class="number">0.0</span>;
+            }
+        }
+    }
+
+    </pre>
+    </body>
+</html>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator/nbactions.xml
--- a/javaquery/demo-calculator/nbactions.xml	Mon Dec 24 07:57:33 2012 +0100
+++ b/javaquery/demo-calculator/nbactions.xml	Mon Dec 24 08:04:45 2012 +0100
@@ -23,7 +23,7 @@
             <actionName>run</actionName>
             <goals>
                 <goal>process-classes</goal>
-                <goal>org.apidesign.bck2brwsr:mojo:0.3-SNAPSHOT:brwsr</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
             </goals>
         </action>
     </actions>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator/pom.xml
--- a/javaquery/demo-calculator/pom.xml	Mon Dec 24 07:57:33 2012 +0100
+++ b/javaquery/demo-calculator/pom.xml	Mon Dec 24 08:04:45 2012 +0100
@@ -4,11 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>demo.calculator</artifactId>
+  <artifactId>demo.static.calculator</artifactId>
   <version>0.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>JavaQuery Demo - Calculator</name>
+  <name>JavaQuery Demo - Calculator - Static Compilation</name>
   <url>http://maven.apache.org</url>
 
   <properties>
@@ -16,19 +16,34 @@
   </properties>
   <build>
       <plugins>
+          <plugin>
+              <groupId>org.apidesign.bck2brwsr</groupId>
+              <artifactId>mojo</artifactId>
+              <version>0.3-SNAPSHOT</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>j2js</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
             <plugin>
-                <groupId>org.apidesign.bck2brwsr</groupId>
-                <artifactId>mojo</artifactId>
-                <version>0.3-SNAPSHOT</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>brwsr</goal>
+                            <goal>exec</goal>
                         </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <startpage>org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml</startpage>
+                    <executable>xdg-open</executable>
+                    <arguments>
+                        <argument>${project.build.directory}/classes/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml</argument>
+                    </arguments>
                 </configuration>
             </plugin>
          <plugin>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml	Mon Dec 24 07:57:33 2012 +0100
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml	Mon Dec 24 08:04:45 2012 +0100
@@ -77,11 +77,7 @@
             </tbody>
         </table>
 
-        <script src="/bck2brwsr.js"></script>
-        <script src="/vm.js"></script>
-        <script type="text/javascript">
-            vm.loadClass('org.apidesign.bck2brwsr.mavenhtml.Calculator');
-        </script>
+        <script src="bootjava.js"/>
         
         <hr/>
     <pre>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-static-calculator/nbactions.xml
--- a/javaquery/demo-static-calculator/nbactions.xml	Mon Dec 24 07:57:33 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<actions>
-        <action>
-            <actionName>run</actionName>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-        </action>
-    </actions>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-static-calculator/pom.xml
--- a/javaquery/demo-static-calculator/pom.xml	Mon Dec 24 07:57:33 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>demo.static.calculator</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>JavaQuery Demo - Calculator - Static Compilation</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apidesign.bck2brwsr</groupId>
-              <artifactId>mojo</artifactId>
-              <version>0.3-SNAPSHOT</version>
-              <executions>
-                  <execution>
-                      <goals>
-                          <goal>j2js</goal>
-                      </goals>
-                  </execution>
-              </executions>
-          </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>xdg-open</executable>
-                    <arguments>
-                        <argument>${project.build.directory}/classes/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-      </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>emul</artifactId>
-      <version>0.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>javaquery.api</artifactId>
-      <version>0.3-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-static-calculator/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java
--- a/javaquery/demo-static-calculator/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java	Mon Dec 24 07:57:33 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,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.
- */
-package org.apidesign.bck2brwsr.mavenhtml;
-
-import org.apidesign.bck2brwsr.htmlpage.api.OnClick;
-import org.apidesign.bck2brwsr.htmlpage.api.Page;
-
-/** HTML5 & Java demo showing the power of 
- * <a href="http://wiki.apidesign.org/wiki/AnnotationProcessor">annotation processors</a>
- * as well as other goodies.
- * 
- * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- */
-@Page(xhtml="Calculator.xhtml")
-public class App {
-    private static double memory;
-    private static String operation;
-    
-    @OnClick(id="clear")
-    static void clear() {
-        memory = 0;
-        operation = null;
-        Calculator.DISPLAY.setValue("0");
-    }
-    
-    @OnClick(id= { "plus", "minus", "mul", "div" })
-    static void applyOp(String op) {
-        memory = getValue();
-        operation = op;
-        Calculator.DISPLAY.setValue("0");
-    }
-    
-    @OnClick(id="result")
-    static void computeTheValue() {
-        switch (operation) {
-            case "plus": setValue(memory + getValue()); break;
-            case "minus": setValue(memory - getValue()); break;
-            case "mul": setValue(memory * getValue()); break;
-            case "div": setValue(memory / getValue()); break;
-            default: throw new IllegalStateException(operation);
-        }
-    }
-    
-    @OnClick(id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
-    static void addDigit(String digit) {
-        digit = digit.substring(1);
-        String v = Calculator.DISPLAY.getValue();
-        if (getValue() == 0.0) {
-            Calculator.DISPLAY.setValue(digit);
-        } else {
-            Calculator.DISPLAY.setValue(v + digit);
-        }
-    }
-    
-    private static void setValue(double v) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(v);
-        if (sb.toString().endsWith(".0")) {
-            final int l = sb.length();
-            sb.delete(l - 2, l);
-        }
-        Calculator.DISPLAY.setValue(sb.toString());
-    }
-
-    private static double getValue() {
-        try {
-            return Double.parseDouble(Calculator.DISPLAY.getValue());
-        } catch (NumberFormatException ex) {
-            Calculator.DISPLAY.setValue("err");
-            return 0.0;
-        }
-    }
-}
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/demo-static-calculator/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml
--- a/javaquery/demo-static-calculator/src/main/resources/org/apidesign/bck2brwsr/mavenhtml/Calculator.xhtml	Mon Dec 24 07:57:33 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>Simple Calculator in HTML5 and Java</title>
-
-        <style type="text/css">
-        body {color: #ffffff; background-color: #121e31; font-family: Monospaced}
-        pre {color: #ffffff; background-color: #121e31; font-family: Monospaced}
-        table {color: #ffffff; background-color: #121e31; font-family: Monospaced}
-        .string {color: #e2ce00}
-        a {color: #e2ce00}
-        .ST1 {color: #0000cc; font-family: Monospaced; font-weight: bold}
-        .ST0 {color: #0000ff}
-        .comment {color: #428bdd}
-        .keyword-directive {color: #f8bb00}
-        .tag {color: #f8bb00}
-        .ST0 {color: #628fb5; background-color: #1b3450}
-        .sgml-comment {color: #808080}
-        .value {color: #99006b}
-        .argument {color: #007c00}
-        .sgml-declaration {color: #bf9221}
-        </style>    
-        </head>
-    <body>
-        <h1>Java and HTML5 - Together at Last!</h1>
-        <table border="0" cellspacing="2">
-            <tbody>
-                <tr>
-                    <td colspan="4"><input id="display" value="0" 
-                            style="text-align: right"/>
-                </td>
-                </tr>
-                <tr>
-                    <td><button id="n1">1</button></td>
-                    <td><button id="n2">2</button></td>
-                    <td><button id="n3">3</button></td>
-                    <td><button id="plus">+</button></td>
-                </tr>
-                <tr>
-                    <td><button id="n4">4</button></td>
-                    <td><button id="n5">5</button></td>
-                    <td><button id="n6">6</button></td>
-                    <td><button id="minus">-</button></td>
-                </tr>
-                <tr>
-                    <td><button id="n7">7</button></td>
-                    <td><button id="n8">8</button></td>
-                    <td><button id="n9">9</button></td>
-                    <td><button id="mul">*</button></td>
-                </tr>
-                <tr>
-                    <td><button id="clear">C</button></td>
-                    <td><button id="n0">0</button></td>
-                    <td><button id="result">=</button></td>
-                    <td><button id="div">/</button></td>
-                </tr>
-            </tbody>
-        </table>
-
-        <script src="bootjava.js"/>
-        
-        <hr/>
-    <pre>
-    <span class="keyword-directive">package</span> org.apidesign.bck2brwsr.mavenhtml;
-
-    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.OnClick;
-    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.Page;
-
-    <span class="comment">/**</span> <span class="comment">HTML5</span><span class="comment"> &amp; </span><span class="comment">Java</span> <span class="comment">demo</span> <span class="comment">showing</span> <span class="comment">the</span> <span class="comment">power</span> <span class="comment">of</span> <a href="http://wiki.apidesign.org/wiki/AnnotationProcessor">annotation processors</a>
-    <span class="comment"> * </span><span class="comment">as</span> <span class="comment">well</span> <span class="comment">as</span> <span class="comment">other</span> <span class="comment">goodies</span><span class="comment">, including type-safe association between</span>
-    <span class="comment"> * </span><span class="comment">an XHTML page and Java.</span>
-    <span class="comment"> * </span>
-    <span class="comment"> * </span><span class="ST1">@author</span> <span class="comment">Jaroslav</span> <span class="comment">Tulach</span> <span class="ST0">&lt;jaroslav.tulach@apidesign.org&gt;</span>
-     <span class="comment">*/</span>
-    @Page(xhtml=<span class="string">&quot;</span><span class="string">Calculator.xhtml</span><span class="string">&quot;</span>)
-    <span class="keyword-directive">public</span> <span class="keyword-directive">class</span> App {
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> memory;
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> String operation;
-
-        @OnClick(id=<span class="string">&quot;</span><span class="string">clear</span><span class="string">&quot;</span>)
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> clear() {
-            memory = <span class="number">0</span>;
-            operation = <span class="keyword-directive">null</span>;
-            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
-        }
-
-        @OnClick(id= { <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span> })
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> applyOp(String op) {
-            memory = getValue();
-            operation = op;
-            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
-        }
-
-        @OnClick(id=<span class="string">&quot;</span><span class="string">result</span><span class="string">&quot;</span>)
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> computeTheValue() {
-            <span class="keyword-directive">switch</span> (operation) {
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>: setValue(memory + getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>: setValue(memory - getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>: setValue(memory * getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span>: setValue(memory / getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">default</span>: <span class="keyword-directive">throw</span> <span class="keyword-directive">new</span> IllegalStateException(operation);
-            }
-        }
-
-        @OnClick(id={<span class="string">&quot;</span><span class="string">n0</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n1</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n2</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n3</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n4</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n5</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n6</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n7</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n8</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n9</span><span class="string">&quot;</span>}) 
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> addDigit(String digit) {
-            digit = digit.substring(<span class="number">1</span>);
-            String v = Calculator.DISPLAY.getValue();
-            <span class="keyword-directive">if</span> (getValue() == <span class="number">0.0</span>) {
-                Calculator.DISPLAY.setValue(digit);
-            } <span class="keyword-directive">else</span> {
-                Calculator.DISPLAY.setValue(v + digit);
-            }
-        }
-
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> setValue(<span class="keyword-directive">double</span> v) {
-            StringBuilder sb = <span class="keyword-directive">new</span> StringBuilder();
-            sb.append(v);
-            Calculator.DISPLAY.setValue(sb.toString());
-        }
-
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> getValue() {
-            <span class="keyword-directive">try</span> {
-                <span class="keyword-directive">return</span> Double.parseDouble(Calculator.DISPLAY.getValue());
-            } <span class="keyword-directive">catch</span> (NumberFormatException ex) {
-                Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">err</span><span class="string">&quot;</span>);
-                <span class="keyword-directive">return</span> <span class="number">0.0</span>;
-            }
-        }
-    }
-
-    </pre>
-    </body>
-</html>
diff -r e5b4bd29f268 -r 5751fe604e6b javaquery/pom.xml
--- a/javaquery/pom.xml	Mon Dec 24 07:57:33 2012 +0100
+++ b/javaquery/pom.xml	Mon Dec 24 08:04:45 2012 +0100
@@ -14,6 +14,6 @@
     <modules>
         <module>api</module>
         <module>demo-calculator</module>
-        <module>demo-static-calculator</module>
+        <module>demo-calculator-dynamic</module>
     </modules>
 </project>