# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1366357766 -7200
# Node ID be21afc3d48a8fab1fb54c9e4391f29b75b7864e
# Parent  df60ba2aeb87ee4cebee4ab76fe595db80d48e21# Parent  e2d1dc505c24fb9ff4c485a7739a233eb6b39e2d
Bringing the latest development on main line to model branch

diff -r df60ba2aeb87 -r be21afc3d48a .hgtags
--- a/.hgtags	Wed Apr 10 12:19:32 2013 +0200
+++ b/.hgtags	Fri Apr 19 09:49:26 2013 +0200
@@ -5,3 +5,4 @@
 caf1e66268fd4100d57922d973ae09a6bf3be847 release-0.4
 caf1e66268fd4100d57922d973ae09a6bf3be847 release-${releaseVersion}
 0000000000000000000000000000000000000000 release-${releaseVersion}
+52a4a5f868bccc67d50ad17f793b9ebabdf75d88 release-0.6
diff -r df60ba2aeb87 -r be21afc3d48a benchmarks/matrix-multiplication/pom.xml
--- a/benchmarks/matrix-multiplication/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/benchmarks/matrix-multiplication/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,12 +4,12 @@
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>matrix.multiplication</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
     <artifactId>benchmarks</artifactId>
     <groupId>org.apidesign.bck2brwsr</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <name>Matrix multiplication</name>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul.mini</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>vmtest</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff -r df60ba2aeb87 -r be21afc3d48a benchmarks/pom.xml
--- a/benchmarks/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/benchmarks/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>benchmarks</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Performance benchmarks</name>
   <modules>
diff -r df60ba2aeb87 -r be21afc3d48a dew/pom.xml
--- a/dew/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/dew/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign</groupId>
     <artifactId>bck2brwsr</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>dew</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Development Environment for Web</name>
   <url>http://maven.apache.org</url>
     <build>
diff -r df60ba2aeb87 -r be21afc3d48a ide/editor/pom.xml
--- a/ide/editor/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/ide/editor/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>ide</artifactId>
         <groupId>org.apidesign.bck2brwsr</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apidesign.bck2brwsr.ide</groupId>
     <artifactId>editor</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     <packaging>nbm</packaging>
 
     <name>Editor Support for Bck2Brwsr</name>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apidesign.bck2brwsr</groupId>
             <artifactId>core</artifactId>
-            <version>0.6-SNAPSHOT</version>
+            <version>0.7-SNAPSHOT</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
diff -r df60ba2aeb87 -r be21afc3d48a ide/pom.xml
--- a/ide/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/ide/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,14 +4,26 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>ide</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>IDE Support</name>
   <modules>
     <module>editor</module>
   </modules>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>2.7</version>
+              <configuration>
+                  <skip>true</skip>
+              </configuration>
+          </plugin>      
+      </plugins>
+  </build>
 </project>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/api/pom.xml
--- a/javaquery/api/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/api/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>javaquery</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>javaquery.api</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>JavaQuery API</name>
   <url>http://maven.apache.org</url>
     <build>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java	Fri Apr 19 09:49:26 2013 +0200
@@ -54,6 +54,9 @@
         if (value == null) {
             return "null";
         }
+        if (value instanceof Enum) {
+            value = value.toString();
+        }
         if (value instanceof String) {
             return '"' + 
                 ((String)value).
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Fri Apr 19 09:49:26 2013 +0200
@@ -23,6 +23,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -245,7 +246,7 @@
                             w.append(type).append("(e));\n");
                         } else if (isEnum[0]) {
                             w.append("    this.prop_").append(pn);
-                            w.append(".add(");
+                            w.append(".add(e == null ? null : ");
                             w.append(type).append(".valueOf((String)e));\n");
                         } else {
                             if (isPrimitive(type)) {
@@ -261,7 +262,7 @@
                     } else {
                         if (isEnum[0]) {
                             w.append("    this.prop_").append(pn);
-                            w.append(" = ");
+                            w.append(" = ret[" + cnt + "] == null ? null : ");
                             w.append(type).append(".valueOf((String)ret[" + cnt + "]);\n");
                         } else if (isPrimitive(type)) {
                             w.append("    this.prop_").append(pn);
@@ -1139,7 +1140,8 @@
         String sep = "";
         for (Prprt p : props) {
             w.write(sep);
-            w.append("    sb.append(\"" + p.name() + ": \");\n");
+            w.append("    sb.append('\"').append(\"" + p.name() + "\")");
+                w.append(".append('\"').append(\":\");\n");
             w.append("    sb.append(org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toJSON(prop_");
             w.append(p.name()).append("));\n");
             sep =    "    sb.append(',');\n";
@@ -1334,7 +1336,7 @@
         String typeName(ProcessingEnvironment env) {
             try {
                 return p.type().getName();
-            } catch (AnnotationTypeMismatchException ex) {
+            } catch (IncompleteAnnotationException | AnnotationTypeMismatchException ex) {
                 for (Object v : getAnnoValues(env)) {
                     String s = v.toString().replace(" ", "");
                     if (s.startsWith("type=") && s.endsWith(".class")) {
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java	Fri Apr 19 09:49:26 2013 +0200
@@ -27,17 +27,17 @@
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
 public class ConvertTypesTest {
-    @JavaScriptBody(args = {  }, body = "var json = new Object();"
+    @JavaScriptBody(args = { "includeSex" }, body = "var json = new Object();"
         + "json.firstName = 'son';\n"
         + "json.lastName = 'dj';\n"
-        + "json.sex = 'MALE';\n"
+        + "if (includeSex) json.sex = 'MALE';\n"
         + "return json;"
     )
-    private static native Object createJSON();
+    private static native Object createJSON(boolean includeSex);
     
     @BrwsrTest
-    public void testConvertToPeople() {
-        final Object o = createJSON();
+    public void testConvertToPeople() throws Exception {
+        final Object o = createJSON(true);
         
         Person p = new Person(o);
         
@@ -45,6 +45,17 @@
         assert "dj".equals(p.getLastName()) : "Last name: " + p.getLastName();
         assert Sex.MALE.equals(p.getSex()) : "Sex: " + p.getSex();
     }
+
+    @BrwsrTest
+    public void testConvertToPeopleWithoutSex() throws Exception {
+        final Object o = createJSON(false);
+        
+        Person p = new Person(o);
+        
+        assert "son".equals(p.getFirstName()) : "First name: " + p.getFirstName();
+        assert "dj".equals(p.getLastName()) : "Last name: " + p.getLastName();
+        assert p.getSex() == null : "No sex: " + p.getSex();
+    }
     
     @Factory public static Object[] create() {
         return VMTest.create(ConvertTypesTest.class);
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java	Fri Apr 19 09:49:26 2013 +0200
@@ -70,6 +70,25 @@
         assertEquals(o.getString("sex"), "MALE");
     }
     
+    @BrwsrTest public void toJSONInABrowser() throws Throwable {
+        Person p = new Person();
+        p.setSex(Sex.MALE);
+        p.setFirstName("Jarda");
+        p.setLastName("Tulach");
+
+        Object json;
+        try {
+            json = parseJSON(p.toString());
+        } catch (Throwable ex) {
+            throw new IllegalStateException("Can't parse " + p).initCause(ex);
+        }
+        
+        Person p2 = new Person(json);
+        
+        assert p2.getFirstName().equals(p.getFirstName()) : 
+            "Should be the same: " + p.getFirstName() + " != " + p2.getFirstName();
+    }
+    
     @Test public void personWithWildCharactersAndNulls() throws JSONException {
         Person p = new Person();
         p.setFirstName("'\"\n");
@@ -213,6 +232,9 @@
     @JavaScriptBody(args = {  }, body = "return window.document.getElementsByTagName('script').length;")
     private static native int scriptElements();
 
+    @JavaScriptBody(args = { "s" }, body = "return window.JSON.parse(s);")
+    private static native Object parseJSON(String s);
+    
     @Http(@Http.Resource(
         content = "{'firstName': 'Sitar', 'sex': 'MALE'}", 
         path="/person.json", 
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-calculator-dynamic/nbactions.xml
--- a/javaquery/demo-calculator-dynamic/nbactions.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator-dynamic/nbactions.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -23,7 +23,7 @@
             <actionName>run</actionName>
             <goals>
                 <goal>process-classes</goal>
-                <goal>org.apidesign.bck2brwsr:mojo:0.6-SNAPSHOT:brwsr</goal>
+                <goal>org.apidesign.bck2brwsr:mojo:0.6:brwsr</goal>
             </goals>
         </action>
     </actions>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-calculator-dynamic/pom.xml
--- a/javaquery/demo-calculator-dynamic/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator-dynamic/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,7 +4,7 @@
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>demo.calculator</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JavaQuery Demo - Calculator</name>
@@ -18,7 +18,7 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -93,13 +93,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -112,7 +112,7 @@
       <artifactId>vm4brwsr</artifactId>
       <classifier>js</classifier>
       <type>zip</type>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff -r df60ba2aeb87 -r be21afc3d48a 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	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml	Fri Apr 19 09:49:26 2013 +0200
@@ -93,7 +93,7 @@
         
         <script src="bck2brwsr.js"></script>
         <script type="text/javascript">
-            var vm = bck2brwsr('demo.calculator-0.5-SNAPSHOT.jar');
+            var vm = bck2brwsr('demo.calculator-0.6.jar');
             vm.loadClass('org.apidesign.bck2brwsr.demo.calc.Calc');
         </script>
         
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-calculator/nbactions.xml
--- a/javaquery/demo-calculator/nbactions.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator/nbactions.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -23,7 +23,7 @@
             <actionName>run</actionName>
             <goals>
                 <goal>package</goal>
-                <goal>org.apidesign.bck2brwsr:mojo:0.5-SNAPSHOT:brwsr</goal>
+                <goal>org.apidesign.bck2brwsr:mojo:0.6:brwsr</goal>
             </goals>
             <properties>
                 <skipTests>true</skipTests>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-calculator/pom.xml
--- a/javaquery/demo-calculator/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,7 +4,7 @@
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>demo.static.calculator</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JavaQuery Demo - Calculator - Static Compilation</name>
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -98,13 +98,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Fri Apr 19 09:49:26 2013 +0200
@@ -91,7 +91,7 @@
         <div data-bind="text: displayPreview"></div>
         <script src="bck2brwsr.js"></script>
         <script>
-            var vm = bck2brwsr('demo.static.calculator-0.5-SNAPSHOT.jar');
+            var vm = bck2brwsr('demo.static.calculator-0.6.jar');
             vm.loadClass('org.apidesign.bck2brwsr.demo.calc.staticcompilation.Calc');
         </script>
     </body>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/demo-twitter/pom.xml
--- a/javaquery/demo-twitter/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/demo-twitter/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>javaquery</artifactId>
     <groupId>org.apidesign.bck2brwsr</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>demo-twitter</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Bck2Brwsr's Twttr</name>
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -89,6 +89,14 @@
              </configuration>
          </plugin>
          <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-deploy-plugin</artifactId>
+           <version>2.7</version>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>      
+         <plugin>
              <artifactId>maven-assembly-plugin</artifactId>
              <version>2.4</version>
              <executions>
@@ -113,13 +121,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -130,7 +138,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>vmtest</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff -r df60ba2aeb87 -r be21afc3d48a javaquery/pom.xml
--- a/javaquery/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/javaquery/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>javaquery</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JavaQuery API and Demo</name>
     <modules>
diff -r df60ba2aeb87 -r be21afc3d48a pom.xml
--- a/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apidesign</groupId>
   <artifactId>bck2brwsr</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Back 2 Browser</name>
   <parent>
diff -r df60ba2aeb87 -r be21afc3d48a rt/archetype/pom.xml
--- a/rt/archetype/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/archetype/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>rt</artifactId>
     <groupId>org.apidesign.bck2brwsr</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>bck2brwsr-archetype-html-sample</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Bck2Brwsr Maven Archetype</name>
   <description>
diff -r df60ba2aeb87 -r be21afc3d48a rt/archetype/src/main/resources/archetype-resources/nbactions.xml
--- a/rt/archetype/src/main/resources/archetype-resources/nbactions.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/archetype/src/main/resources/archetype-resources/nbactions.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,7 +4,7 @@
         <actionName>run</actionName>
         <goals>
             <goal>process-classes</goal>
-            <goal>org.apidesign.bck2brwsr:mojo:0.6-SNAPSHOT:brwsr</goal>
+            <goal>org.apidesign.bck2brwsr:mojo:0.7-SNAPSHOT:brwsr</goal>
         </goals>
     </action>
 </actions>
diff -r df60ba2aeb87 -r be21afc3d48a rt/archetype/src/main/resources/archetype-resources/pom.xml
--- a/rt/archetype/src/main/resources/archetype-resources/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/archetype/src/main/resources/archetype-resources/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -44,7 +44,7 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -103,13 +103,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -122,13 +122,13 @@
       <artifactId>vm4brwsr</artifactId>
       <classifier>js</classifier>
       <type>zip</type>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>vmtest</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff -r df60ba2aeb87 -r be21afc3d48a rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java
--- a/rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java	Fri Apr 19 09:49:26 2013 +0200
@@ -24,7 +24,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathFactory;
 import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeClass;
 import org.w3c.dom.Document;
diff -r df60ba2aeb87 -r be21afc3d48a rt/core/pom.xml
--- a/rt/core/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/core/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>core</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Bck2Brwsr Native Annotations</name>
   <url>http://maven.apache.org</url>
     <build>
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/brwsrtest/pom.xml
--- a/rt/emul/brwsrtest/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/brwsrtest/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>emul.pom</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>brwsrtest</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Tests Inside Real Browser</name>
   <url>http://maven.apache.org</url>
   <properties>
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/compact/pom.xml
--- a/rt/emul/compact/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/compact/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>emul.pom</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>emul</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Bck2Brwsr API Profile</name>
   <url>http://maven.apache.org</url>
   <properties>
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java
--- a/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java	Fri Apr 19 09:49:26 2013 +0200
@@ -30,7 +30,7 @@
 public class ZipCompatibilityTest {
     @Compare
     public String testDemoStaticCalculator() throws IOException {
-        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        InputStream is = getClass().getResourceAsStream("demo.static.calculator-TEST.jar");
         ZipArchive zip = ZipArchive.createZip(is);
         final String ts = zip.toString();
         return ts.substring(0, 4096) + ts.hashCode();
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java
--- a/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java	Fri Apr 19 09:49:26 2013 +0200
@@ -27,10 +27,10 @@
  */
 public class ZipVsJzLibTest {
     @Test public void r() throws IOException {
-        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        InputStream is = getClass().getResourceAsStream("demo.static.calculator-TEST.jar");
         ZipArchive zip = ZipArchive.createZip(is);
         
-        is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        is = getClass().getResourceAsStream("demo.static.calculator-TEST.jar");
         ZipArchive real = ZipArchive.createReal(is);
         
         real.assertEquals(zip, "Are they the same?");
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar
Binary file rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar has changed
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-TEST.jar
Binary file rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-TEST.jar has changed
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/mini/pom.xml
--- a/rt/emul/mini/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/mini/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>emul.pom</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>emul.mini</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Minimal API Profile</name>
   <url>http://maven.apache.org</url>
   <properties>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>core</artifactId>
-      <version>0.6-SNAPSHOT</version>
+      <version>0.7-SNAPSHOT</version>
       <type>jar</type>
     </dependency>
     <dependency>
diff -r df60ba2aeb87 -r be21afc3d48a rt/emul/pom.xml
--- a/rt/emul/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/emul/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>emul.pom</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Emulation of Core Libraries</name>
   <modules>
diff -r df60ba2aeb87 -r be21afc3d48a rt/launcher/pom.xml
--- a/rt/launcher/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/launcher/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>launcher</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <name>Bck2Brwsr Launcher</name>
   <url>http://maven.apache.org</url>
     <build>
diff -r df60ba2aeb87 -r be21afc3d48a rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java
--- a/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Fri Apr 19 09:49:26 2013 +0200
@@ -76,10 +76,9 @@
     
     private static void finishTest(Case c, Object res) {
         if ("null".equals(res)) {
-            setAttr(statusArea, "innerHTML", "OK");
-            setAttr(statusArea, "href", null);
+            setAttr(statusArea, "innerHTML", "Success");
         } else {
-            setAttr(statusArea, "innerHTML", "run again");
+            setAttr(statusArea, "innerHTML", "Result " + res);
         }
         statusArea = null;
         textArea = null;
@@ -88,19 +87,25 @@
     @JavaScriptBody(args = { "test", "c", "arr" }, body = 
           "var ul = window.document.getElementById('bck2brwsr.result');\n"
         + "var li = window.document.createElement('li');\n"
-        + "var span = window.document.createElement('span');\n"
+        + "var span = window.document.createElement('span');"
         + "span.innerHTML = test + ' - ';\n"
+        + "var details = window.document.createElement('a');\n"
+        + "details.innerHTML = 'Details';\n"
+        + "details.href = '#';\n"
         + "var p = window.document.createElement('p');\n"
         + "var status = window.document.createElement('a');\n"
         + "status.innerHTML = 'running';"
-        + "status.href = '#';\n"
+        + "details.onclick = function() { li.appendChild(p); li.removeChild(details); status.innerHTML = 'Run Again'; status.href = '#'; };\n"
         + "status.onclick = function() { c.again__V_3Ljava_lang_Object_2(arr); }\n"
         + "var pre = window.document.createElement('textarea');\n"
-        + "pre.width = '90%';"
-        + "pre.height = 100;"
+        + "pre.cols = 100;"
+        + "pre.rows = 10;"
         + "li.appendChild(span);\n"
         + "li.appendChild(status);\n"
-        + "li.appendChild(p);\n"
+        + "var span = window.document.createElement('span');"
+        + "span.innerHTML = ' ';\n"
+        + "li.appendChild(span);\n"
+        + "li.appendChild(details);\n"
         + "p.appendChild(pre);\n"
         + "ul.appendChild(li);\n"
         + "arr[0] = pre;\n"
diff -r df60ba2aeb87 -r be21afc3d48a rt/mojo/pom.xml
--- a/rt/mojo/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/mojo/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>mojo</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Bck2Brwsr Maven Plugins</name>
   <url>http://maven.apache.org</url>
diff -r df60ba2aeb87 -r be21afc3d48a rt/pom.xml
--- a/rt/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>rt</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Bck2Brwsr Runtime</name>
   <parent>
     <groupId>org.apidesign</groupId>
     <artifactId>bck2brwsr</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>  
   <modules>
     <module>core</module>
diff -r df60ba2aeb87 -r be21afc3d48a rt/vm/pom.xml
--- a/rt/vm/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/vm/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -3,12 +3,12 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>vm4brwsr</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Virtual Machine for Browser</name>
diff -r df60ba2aeb87 -r be21afc3d48a rt/vmtest/pom.xml
--- a/rt/vmtest/pom.xml	Wed Apr 10 12:19:32 2013 +0200
+++ b/rt/vmtest/pom.xml	Fri Apr 19 09:49:26 2013 +0200
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>rt</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>vmtest</artifactId>
-  <version>0.6-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   
   <name>VM Testing APIs</name>
   <url>http://bck2brwsr.apidesign.org</url>