# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1395311128 -3600
# Node ID 4dce5ea7e13acd0389ded2848112d8bee91ce443
# Parent  fcdfcb9998eb22b9b626880e972a9a558bfa45dd# Parent  c9ea9ae71c2c3d53e25936b8689dc5e25df7aecb
Merging teavm branch into default line, now when teavm 0.1 is out

diff -r fcdfcb9998eb -r 4dce5ea7e13a chess/pom.xml
--- a/chess/pom.xml	Sun Mar 16 09:26:09 2014 +0100
+++ b/chess/pom.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -141,6 +141,11 @@
       <scope>provided</scope>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>ko4j</artifactId>
+      <version>${net.java.html.version}</version>
+    </dependency>
   </dependencies>
   <profiles>
       <profile>
@@ -252,5 +257,78 @@
               </dependency>
           </dependencies>
       </profile>
+      <profile>
+          <id>teabrwsr</id>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.teavm</groupId>
+                      <artifactId>teavm-maven-plugin</artifactId>
+                      <version>${teavm.version}</version>
+                      <dependencies>
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-classlib</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                          <!-- This module adds html4j support. It mainly includes JavaScriptBuilder support.
+                          Also there are some little patches to JCL emulation, that are required to pass TCK -->
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-html4j</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                      </dependencies>
+                      <executions>
+                          <execution>
+                              <id>generate-minesweeper</id>
+                              <goals>
+                                  <goal>build-javascript</goal>
+                              </goals>
+                              <phase>process-classes</phase>
+                              <configuration>
+                                  <!-- Whether we want TeaVM to minify (obfuscate) the generated JavaScript -->
+                                  <minifying>false</minifying>
+                                  <properties>
+                                      <!-- This classes (separated with , ; space) will be available through vm.loadClass() -->
+                                      <html4j.entryPoints>org.apidesign.html.demo.chess.LoadMain</html4j.entryPoints>
+                                  </properties>
+                                  <!-- Don't include main page - we created it by ourselves -->
+                                  <mainPageIncluded>false</mainPageIncluded>
+                                  <!-- Merge runtime.js instead of putting as a separate file -->
+                                  <runtime>MERGED</runtime>
+                                  <!-- Name of the generated file -->
+                                  <targetFileName>bck2brwsr.js</targetFileName>
+                                  <targetDirectory>${project.build.directory}/teavm</targetDirectory>
+                                  <!-- This transformer adds null checks before virtual calls. It is not included
+                                  by default as we don't always need these null checks -->
+                                  <transformers>
+                                      <param>org.teavm.javascript.NullPointerExceptionTransformer</param>
+                                  </transformers>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </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/teabrwsr.xml</descriptor>
+                                  </descriptors>
+                              </configuration>
+                          </execution>
+                      </executions>                
+                  </plugin>      
+              </plugins>
+          </build>
+      </profile>
   </profiles>
 </project>
diff -r fcdfcb9998eb -r 4dce5ea7e13a chess/src/main/assembly/teabrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chess/src/main/assembly/teabrwsr.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<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>teabrwsr</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>true</filtered>
+      </fileSet>
+      <fileSet>
+          <directory>${project.build.directory}/teavm/</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+      </fileSet>
+  </fileSets>
+</assembly>
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/AndroidManifest.xml
--- a/minesweeper/AndroidManifest.xml	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/AndroidManifest.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -48,8 +48,8 @@
             </intent-filter>
         </activity>
         <meta-data android:name="loadPage" android:value="file:///android_asset/pages/index.html" />
-        <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.Main" />
-        <meta-data android:name="invoke" android:value="onPageLoad" />
+        <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.MinesModel" />
+        <meta-data android:name="invoke" android:value="main" />
     </application>
     
 </manifest>
\ No newline at end of file
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/pom.xml
--- a/minesweeper/pom.xml	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/pom.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -293,7 +293,79 @@
                   </plugin>
               </plugins>
           </build>
-          
+      </profile>
+      <profile>
+          <id>teabrwsr</id>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.teavm</groupId>
+                      <artifactId>teavm-maven-plugin</artifactId>
+                      <version>${teavm.version}</version>
+                      <dependencies>
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-classlib</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                          <!-- This module adds html4j support. It mainly includes JavaScriptBuilder support.
+                          Also there are some little patches to JCL emulation, that are required to pass TCK -->
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-html4j</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                      </dependencies>
+                      <executions>
+                          <execution>
+                              <id>generate-minesweeper</id>
+                              <goals>
+                                  <goal>build-javascript</goal>
+                              </goals>
+                              <phase>process-classes</phase>
+                              <configuration>
+                                  <!-- Whether we want TeaVM to minify (obfuscate) the generated JavaScript -->
+                                  <minifying>false</minifying>
+                                  <properties>
+                                      <!-- This classes (separated with , ; space) will be available through vm.loadClass() -->
+                                      <html4j.entryPoints>org.apidesign.demo.minesweeper.MainBrwsr</html4j.entryPoints>
+                                  </properties>
+                                  <!-- Don't include main page - we created it by ourselves -->
+                                  <mainPageIncluded>false</mainPageIncluded>
+                                  <!-- Merge runtime.js instead of putting as a separate file -->
+                                  <runtime>MERGED</runtime>
+                                  <!-- Name of the generated file -->
+                                  <targetFileName>bck2brwsr.js</targetFileName>
+                                  <targetDirectory>${project.build.directory}/teavm</targetDirectory>
+                                  <!-- This transformer adds null checks before virtual calls. It is not included
+                                  by default as we don't always need these null checks -->
+                                  <transformers>
+                                      <param>org.teavm.javascript.NullPointerExceptionTransformer</param>
+                                  </transformers>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </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/teabrwsr.xml</descriptor>
+                                  </descriptors>
+                              </configuration>
+                          </execution>
+                      </executions>                
+                  </plugin>      
+              </plugins>
+          </build>
       </profile>
   </profiles>  
 </project>
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/src/main/assembly/teabrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/src/main/assembly/teabrwsr.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<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>teabrwsr</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>true</filtered>
+      </fileSet>
+      <fileSet>
+          <directory>${project.build.directory}/teavm/</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+      </fileSet>
+  </fileSets>
+</assembly>
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Thu Mar 20 11:25:28 2014 +0100
@@ -30,20 +30,14 @@
 public final class Main {
     private Main() {
     }
-    
+
     /** Launches the browser */
     public static void main(String... args) throws Exception {
         BrowserBuilder.newBrowser().
             loadPage("pages/index.html").
-            loadClass(Main.class).
-            invoke("onPageLoad", args).
+            loadClass(MinesModel.class).
+            invoke("main", args).
             showAndWait();
         System.exit(0);
     }
-    
-    /** Called when page is ready */
-    public static void onPageLoad(String... args) throws Exception {
-        Mines m = new Mines();
-        m.applyBindings();
-    }
 }
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Thu Mar 20 11:25:28 2014 +0100
@@ -26,7 +26,7 @@
 public class MainBrwsr {
     static {
         try {
-            Main.onPageLoad();
+            MinesModel.main();
         } catch (Exception ex) {
             throw new IllegalStateException(ex);
         }
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Thu Mar 20 11:25:28 2014 +0100
@@ -39,7 +39,7 @@
     @Property(name = "state", type = MinesModel.GameState.class),
     @Property(name = "rows", type = Row.class, array = true),
 })
-final class MinesModel {
+public final class MinesModel {
     enum GameState {
         IN_PROGRESS, WON, LOST;
     }
@@ -311,5 +311,12 @@
         Square sq = columns.get(x);
         return sq.isMine() ? 1 : 0;
     }
-    
+
+    /**
+     * Called when page is ready
+     */
+    public static void main(String... args) throws Exception {
+        Mines m = new Mines();
+        m.applyBindings();
+    }
 }
diff -r fcdfcb9998eb -r 4dce5ea7e13a minesweeper/src/main/webapp/pages/index.html
--- a/minesweeper/src/main/webapp/pages/index.html	Sun Mar 16 09:26:09 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/index.html	Thu Mar 20 11:25:28 2014 +0100
@@ -142,13 +142,14 @@
                 target="_blank" href="http://bck2brwsr.apidesign.org"
                 role="button">Learn more &raquo;</a></p>
        </div>
+      </div>
     </div>
-        
+
+        <!-- boot bck2brwsr -->
         <script type="text/javascript" src="bck2brwsr.js"></script>
         <script>
             var vm = bck2brwsr('${project.build.finalName}.jar');
             vm.loadClass('org.apidesign.demo.minesweeper.MainBrwsr');
         </script>
-        
     </body>
 </html>
diff -r fcdfcb9998eb -r 4dce5ea7e13a pom.xml
--- a/pom.xml	Sun Mar 16 09:26:09 2014 +0100
+++ b/pom.xml	Thu Mar 20 11:25:28 2014 +0100
@@ -15,6 +15,7 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <net.java.html.version>0.7.6</net.java.html.version>
       <bck2brwsr.version>0.8.1</bck2brwsr.version>
+      <teavm.version>0.1</teavm.version>
       <license>COPYING</license>
   </properties>
   <modules>