1.1 --- a/javaquery/demo-calculator-dynamic/nbactions.xml	Fri Apr 26 13:51:15 2013 +0200
     1.2 +++ b/javaquery/demo-calculator-dynamic/nbactions.xml	Fri Apr 26 16:31:55 2013 +0200
     1.3 @@ -23,7 +23,7 @@
     1.4              <actionName>run</actionName>
     1.5              <goals>
     1.6                  <goal>process-classes</goal>
     1.7 -                <goal>org.apidesign.bck2brwsr:mojo:0.6:brwsr</goal>
     1.8 +                <goal>bck2brwsr:brwsr</goal>
     1.9              </goals>
    1.10          </action>
    1.11      </actions>

     2.1 --- a/javaquery/demo-calculator-dynamic/pom.xml	Fri Apr 26 13:51:15 2013 +0200
     2.2 +++ b/javaquery/demo-calculator-dynamic/pom.xml	Fri Apr 26 16:31:55 2013 +0200
     2.3 @@ -17,8 +17,8 @@
     2.4        <plugins>
     2.5              <plugin>
     2.6                  <groupId>org.apidesign.bck2brwsr</groupId>
     2.7 -                <artifactId>mojo</artifactId>
     2.8 -                <version>0.7-SNAPSHOT</version>
     2.9 +                <artifactId>bck2brwsr-maven-plugin</artifactId>
    2.10 +                <version>${project.version}</version>
    2.11                  <executions>
    2.12                      <execution>
    2.13                          <goals>
    2.14 @@ -93,13 +93,13 @@
    2.15      <dependency>
    2.16        <groupId>org.apidesign.bck2brwsr</groupId>
    2.17        <artifactId>emul</artifactId>
    2.18 -      <version>0.7-SNAPSHOT</version>
    2.19 +      <version>${project.version}</version>
    2.20        <classifier>rt</classifier>
    2.21      </dependency>
    2.22      <dependency>
    2.23        <groupId>org.apidesign.bck2brwsr</groupId>
    2.24        <artifactId>javaquery.api</artifactId>
    2.25 -      <version>0.7-SNAPSHOT</version>
    2.26 +      <version>${project.version}</version>
    2.27      </dependency>
    2.28      <dependency>
    2.29        <groupId>org.testng</groupId>
    2.30 @@ -112,7 +112,7 @@
    2.31        <artifactId>vm4brwsr</artifactId>
    2.32        <classifier>js</classifier>
    2.33        <type>zip</type>
    2.34 -      <version>0.7-SNAPSHOT</version>
    2.35 +      <version>${project.version}</version>
    2.36        <scope>provided</scope>
    2.37      </dependency>
    2.38    </dependencies>

     3.1 --- a/javaquery/demo-calculator/nbactions.xml	Fri Apr 26 13:51:15 2013 +0200
     3.2 +++ b/javaquery/demo-calculator/nbactions.xml	Fri Apr 26 16:31:55 2013 +0200
     3.3 @@ -23,7 +23,7 @@
     3.4              <actionName>run</actionName>
     3.5              <goals>
     3.6                  <goal>package</goal>
     3.7 -                <goal>org.apidesign.bck2brwsr:mojo:0.6:brwsr</goal>
     3.8 +                <goal>bck2brwsr:brwsr</goal>
     3.9              </goals>
    3.10              <properties>
    3.11                  <skipTests>true</skipTests>

     4.1 --- a/javaquery/demo-calculator/pom.xml	Fri Apr 26 13:51:15 2013 +0200
     4.2 +++ b/javaquery/demo-calculator/pom.xml	Fri Apr 26 16:31:55 2013 +0200
     4.3 @@ -18,8 +18,8 @@
     4.4        <plugins>
     4.5              <plugin>
     4.6                  <groupId>org.apidesign.bck2brwsr</groupId>
     4.7 -                <artifactId>mojo</artifactId>
     4.8 -                <version>0.7-SNAPSHOT</version>
     4.9 +                <artifactId>bck2brwsr-maven-plugin</artifactId>
    4.10 +                <version>${project.version}</version>
    4.11                  <executions>
    4.12                      <execution>
    4.13                          <goals>
    4.14 @@ -98,13 +98,13 @@
    4.15      <dependency>
    4.16        <groupId>org.apidesign.bck2brwsr</groupId>
    4.17        <artifactId>emul</artifactId>
    4.18 -      <version>0.7-SNAPSHOT</version>
    4.19 +      <version>${project.version}</version>
    4.20        <classifier>rt</classifier>
    4.21      </dependency>
    4.22      <dependency>
    4.23        <groupId>org.apidesign.bck2brwsr</groupId>
    4.24        <artifactId>javaquery.api</artifactId>
    4.25 -      <version>0.7-SNAPSHOT</version>
    4.26 +      <version>${project.version}</version>
    4.27      </dependency>
    4.28    </dependencies>
    4.29  </project>

     5.1 --- a/javaquery/demo-twitter/nbactions.xml	Fri Apr 26 13:51:15 2013 +0200
     5.2 +++ b/javaquery/demo-twitter/nbactions.xml	Fri Apr 26 16:31:55 2013 +0200
     5.3 @@ -23,7 +23,7 @@
     5.4          <actionName>run</actionName>
     5.5          <goals>
     5.6              <goal>process-classes</goal>
     5.7 -            <goal>org.apidesign.bck2brwsr:mojo:0.7-SNAPSHOT:brwsr</goal>
     5.8 +            <goal>bck2brwsr:brwsr</goal>
     5.9          </goals>
    5.10      </action>
    5.11  </actions>

     6.1 --- a/javaquery/demo-twitter/pom.xml	Fri Apr 26 13:51:15 2013 +0200
     6.2 +++ b/javaquery/demo-twitter/pom.xml	Fri Apr 26 16:31:55 2013 +0200
     6.3 @@ -50,8 +50,8 @@
     6.4        <plugins>
     6.5              <plugin>
     6.6                  <groupId>org.apidesign.bck2brwsr</groupId>
     6.7 -                <artifactId>mojo</artifactId>
     6.8 -                <version>0.7-SNAPSHOT</version>
     6.9 +                <artifactId>bck2brwsr-maven-plugin</artifactId>
    6.10 +                <version>${project.version}</version>
    6.11                  <executions>
    6.12                      <execution>
    6.13                          <goals>
    6.14 @@ -121,13 +121,13 @@
    6.15      <dependency>
    6.16        <groupId>org.apidesign.bck2brwsr</groupId>
    6.17        <artifactId>emul</artifactId>
    6.18 -      <version>0.7-SNAPSHOT</version>
    6.19 +      <version>${project.version}</version>
    6.20        <classifier>rt</classifier>
    6.21      </dependency>
    6.22      <dependency>
    6.23        <groupId>org.apidesign.bck2brwsr</groupId>
    6.24        <artifactId>javaquery.api</artifactId>
    6.25 -      <version>0.7-SNAPSHOT</version>
    6.26 +      <version>${project.version}</version>
    6.27        <scope>runtime</scope>
    6.28      </dependency>
    6.29      <dependency>
    6.30 @@ -139,7 +139,7 @@
    6.31      <dependency>
    6.32        <groupId>org.apidesign.bck2brwsr</groupId>
    6.33        <artifactId>vmtest</artifactId>
    6.34 -      <version>0.7-SNAPSHOT</version>
    6.35 +      <version>${project.version}</version>
    6.36        <scope>test</scope>
    6.37      </dependency>
    6.38      <dependency>

     7.1 --- a/rt/archetype/src/main/resources/archetype-resources/nbactions.xml	Fri Apr 26 13:51:15 2013 +0200
     7.2 +++ b/rt/archetype/src/main/resources/archetype-resources/nbactions.xml	Fri Apr 26 16:31:55 2013 +0200
     7.3 @@ -4,7 +4,7 @@
     7.4          <actionName>run</actionName>
     7.5          <goals>
     7.6              <goal>process-classes</goal>
     7.7 -            <goal>org.apidesign.bck2brwsr:mojo:0.7-SNAPSHOT:brwsr</goal>
     7.8 +            <goal>bck2brwsr:brwsr</goal>
     7.9          </goals>
    7.10      </action>
    7.11  </actions>

     8.1 --- a/rt/archetype/src/main/resources/archetype-resources/pom.xml	Fri Apr 26 13:51:15 2013 +0200
     8.2 +++ b/rt/archetype/src/main/resources/archetype-resources/pom.xml	Fri Apr 26 16:31:55 2013 +0200
     8.3 @@ -43,7 +43,7 @@
     8.4        <plugins>
     8.5              <plugin>
     8.6                  <groupId>org.apidesign.bck2brwsr</groupId>
     8.7 -                <artifactId>mojo</artifactId>
     8.8 +                <artifactId>bck2brwsr-maven-plugin</artifactId>
     8.9                  <version>0.7-SNAPSHOT</version>
    8.10                  <executions>
    8.11                      <execution>

     9.1 --- a/rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java	Fri Apr 26 13:51:15 2013 +0200
     9.2 +++ b/rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java	Fri Apr 26 16:31:55 2013 +0200
     9.3 @@ -94,9 +94,7 @@
     9.4          for (int i = 0; i < goals.getLength(); i++) {
     9.5              String s = goals.item(i).getTextContent();
     9.6              if (s.contains("bck2brwsr")) {
     9.7 -                String[] arr = s.split(":");
     9.8 -                assertEquals(arr.length, 4, "Three :");
     9.9 -                assertEquals(arr[2], version, "Proper version is used");
    9.10 +                assertFalse(s.matches(".*bck2brwsr.*[0-9].*"), "No numbers: " + s);
    9.11              }
    9.12          }
    9.13      }

    10.1 --- a/rt/emul/mini/src/main/java/java/lang/Throwable.java	Fri Apr 26 13:51:15 2013 +0200
    10.2 +++ b/rt/emul/mini/src/main/java/java/lang/Throwable.java	Fri Apr 26 16:31:55 2013 +0200
    10.3 @@ -1085,4 +1085,22 @@
    10.4  //        else
    10.5  //            return suppressedExceptions.toArray(EMPTY_THROWABLE_ARRAY);
    10.6      }
    10.7 +    
    10.8 +    private static Object bck2BrwsrCnvrt(Object o) {
    10.9 +        if (o instanceof Throwable) {
   10.10 +            return o;
   10.11 +        }
   10.12 +        final String msg = msg(o);
   10.13 +        if (msg == null || msg.startsWith("TypeError")) {
   10.14 +            return new NullPointerException(msg);
   10.15 +        }
   10.16 +        return new Throwable(msg);
   10.17 +    }
   10.18 +    
   10.19 +    @JavaScriptBody(args = { "o" }, body = "return o ? o.toString() : null;")
   10.20 +    private static native String msg(Object o);
   10.21 +
   10.22 +    @JavaScriptOnly(name = "bck2BrwsrCnvrt", value = "c.bck2BrwsrCnvrt__Ljava_lang_Object_2Ljava_lang_Object_2")
   10.23 +    private static void bck2BrwsrCnvrtVM() {
   10.24 +    }
   10.25  }

    11.1 --- a/rt/mojo/pom.xml	Fri Apr 26 13:51:15 2013 +0200
    11.2 +++ b/rt/mojo/pom.xml	Fri Apr 26 16:31:55 2013 +0200
    11.3 @@ -7,11 +7,11 @@
    11.4      <version>0.7-SNAPSHOT</version>
    11.5    </parent>
    11.6    <groupId>org.apidesign.bck2brwsr</groupId>
    11.7 -  <artifactId>mojo</artifactId>
    11.8 +  <artifactId>bck2brwsr-maven-plugin</artifactId>
    11.9    <version>0.7-SNAPSHOT</version>
   11.10    <packaging>maven-plugin</packaging>
   11.11 -  <name>Bck2Brwsr Maven Plugins</name>
   11.12 -  <url>http://maven.apache.org</url>
   11.13 +  <name>Bck2Brwsr Maven Plugin</name>
   11.14 +  <url>http://bck2brwsr.apidesign.org/</url>
   11.15        <build>
   11.16          <plugins>
   11.17              <plugin>

    12.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Apr 26 13:51:15 2013 +0200
    12.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Apr 26 16:31:55 2013 +0200
    12.3 @@ -1787,20 +1787,11 @@
    12.4              if (e.catch_cpx != 0) { //not finally
    12.5                  final String classInternalName = jc.getClassName(e.catch_cpx);
    12.6                  addReference(classInternalName);
    12.7 -                if ("java/lang/Throwable".equals(classInternalName)) {
    12.8 -                    out.append("if (e.$instOf_java_lang_Throwable) {");
    12.9 -                    out.append("  var stA0 = e;");
   12.10 -                    out.append("} else {");
   12.11 -                    out.append("  var stA0 = vm.java_lang_Throwable(true);");
   12.12 -                    out.append("  vm.java_lang_Throwable.cons__VLjava_lang_String_2.call(stA0, e.toString());");
   12.13 -                    out.append("}");
   12.14 -                    goTo(out, current, e.handler_pc, topMostLabel);
   12.15 -                } else {
   12.16 -                    out.append("if (e.$instOf_" + classInternalName.replace('/', '_') + ") {");
   12.17 -                    out.append("var stA0 = e;");
   12.18 -                    goTo(out, current, e.handler_pc, topMostLabel);
   12.19 -                    out.append("}\n");
   12.20 -                }
   12.21 +                out.append("e = vm.java_lang_Throwable(false).bck2BrwsrCnvrt(e);");
   12.22 +                out.append("if (e.$instOf_" + classInternalName.replace('/', '_') + ") {");
   12.23 +                out.append("var stA0 = e;");
   12.24 +                goTo(out, current, e.handler_pc, topMostLabel);
   12.25 +                out.append("}\n");
   12.26              } else {
   12.27                  finallyPC = e.handler_pc;
   12.28              }

    13.1 --- a/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSub.java	Fri Apr 26 13:51:15 2013 +0200
    13.2 +++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSub.java	Fri Apr 26 16:31:55 2013 +0200
    13.3 @@ -24,4 +24,7 @@
    13.4      public static Object getNonNull() {
    13.5          return NON_NULL;
    13.6      }
    13.7 +    static Object getNull() {
    13.8 +        return null;
    13.9 +    }
   13.10  }

    14.1 --- a/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSubTest.java	Fri Apr 26 13:51:15 2013 +0200
    14.2 +++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSubTest.java	Fri Apr 26 16:31:55 2013 +0200
    14.3 @@ -30,6 +30,14 @@
    14.4          Object ret = StaticUseSub.getNonNull();
    14.5          return ret.getClass().getName();
    14.6      }
    14.7 +    
    14.8 +    @Compare public String isNullPointerTheSame() throws Exception {
    14.9 +        try {
   14.10 +            return StaticUseSub.getNull().getClass().toString();
   14.11 +        } catch (NullPointerException ex) {
   14.12 +            return ex.getClass().getName();
   14.13 +        }
   14.14 +    }
   14.15  
   14.16      @Factory public static Object[] create() {
   14.17          return VMTest.create(StaticUseSubTest.class);