# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1395929688 -3600
# Node ID 533c2be1747c0147853eaebb8a052ddda84aa0a3
# Parent  17aafe5116d521cff7ba8c8dbcfdb00d5f164fa8# Parent  26c8dc62cb636d989d3c3aaff4a56642668f2045
Merge from main line and resolve all the conflicts

diff -r 17aafe5116d5 -r 533c2be1747c chess/pom.xml
--- a/chess/pom.xml	Thu Mar 27 09:57:14 2014 +0100
+++ b/chess/pom.xml	Thu Mar 27 15:14:48 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 17aafe5116d5 -r 533c2be1747c 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 27 15:14:48 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 17aafe5116d5 -r 533c2be1747c minesweeper/AndroidManifest.xml
--- a/minesweeper/AndroidManifest.xml	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/AndroidManifest.xml	Thu Mar 27 15:14:48 2014 +0100
@@ -39,7 +39,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
-        <activity android:name="org.apidesign.html.brwsr.DlvkBrwsr" 
+        <activity android:name="org.apidesign.brwsr.DlvkBrwsr" 
                   android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -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 17aafe5116d5 -r 533c2be1747c minesweeper/nbactions.xml
--- a/minesweeper/nbactions.xml	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/nbactions.xml	Thu Mar 27 15:14:48 2014 +0100
@@ -23,29 +23,5 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
---><actions>
-    <action>
-        <actionName>run</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>exec:java</goal>
-        </goals>
-    </action>
-    <action>
-        <actionName>debug</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>exec:java</goal>
-        </goals>
-        <properties>
-            <jpda.listen>maven</jpda.listen>
-        </properties>
-    </action>
-    <action>
-            <actionName>CUSTOM-iPad Sim</actionName>
-            <displayName>iPad Sim</displayName>
-            <goals>
-                <goal>robovm:ipad-sim</goal>
-            </goals>
-        </action>
+-->
 </actions>
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/pom.xml
--- a/minesweeper/pom.xml	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/pom.xml	Thu Mar 27 15:14:48 2014 +0100
@@ -116,6 +116,11 @@
     </dependency>
     <dependency>
         <groupId>org.netbeans.html</groupId>
+        <artifactId>net.java.html</artifactId>
+        <version>${net.java.html.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.netbeans.html</groupId>
         <artifactId>net.java.html.sound</artifactId>
         <version>${net.java.html.version}</version>
     </dependency>
@@ -125,6 +130,12 @@
         <version>${net.java.html.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>nbrwsr</artifactId>
+      <version>${net.java.html.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>6.7</version>
@@ -253,11 +264,6 @@
       </profile>
       <profile>
           <id>dlvkbrwsr</id>
-          <activation>
-              <property>
-                  <name>android.sdk.path</name>
-              </property>
-          </activation>
           <properties>
               <platform.version>4.1.1.4</platform.version>
               <android.plugin.version>3.7.0</android.plugin.version>
@@ -271,9 +277,9 @@
                   <scope>provided</scope>
               </dependency>
               <dependency>
-                  <groupId>org.apidesign.html</groupId>
+                  <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>dlvkbrwsr</artifactId>
-                  <version>0.2-SNAPSHOT</version>
+                  <version>0.5</version>
                   <type>jar</type>
               </dependency>
               <dependency>
@@ -308,6 +314,7 @@
                                   <metaInclude>services/org.apidesign.**</metaInclude>
                               </metaIncludes>
                           </apk>
+                          <extractDuplicates>true</extractDuplicates>
                           <file>${project.build.directory}/${project.build.finalName}.apk</file>
                       </configuration>
                       <executions>
@@ -344,7 +351,165 @@
                   </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>
+      <profile>
+          <id>nbrwsr</id>
+          <dependencies>
+              <dependency>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>nbrwsr</artifactId>
+                  <version>${net.java.html.version}</version>
+                  <scope>compile</scope>
+              </dependency>
+          </dependencies>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-resources-plugin</artifactId>
+                      <version>2.6</version>
+                      <executions>
+                          <execution>
+                              <id>include-webpages</id>
+                              <goals>
+                                  <goal>copy-resources</goal>
+                              </goals>
+                              <phase>process-resources</phase>
+                              <configuration>
+                                  <outputDirectory>${basedir}/target/classes/org/apidesign/demo/minesweeper</outputDirectory>
+                                  <overwrite>true</overwrite>
+                                  <resources>          
+                                      <resource>
+                                          <directory>src/main/webapp/pages</directory>
+                                      </resource>
+                                  </resources>              
+                              </configuration>   
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>nbm-maven-plugin</artifactId>
+                      <version>3.13</version>
+                      <extensions>true</extensions>
+                      <executions>
+                          <execution>
+                              <id>default-manifest</id>
+                              <phase>process-classes</phase>
+                              <goals>
+                                  <goal>manifest</goal>
+                              </goals>
+                              <configuration>
+                                  <useOSGiDependencies>true</useOSGiDependencies>
+                                  <brandingToken>html4j4nb</brandingToken>
+                                  <cluster>html4j4nb</cluster>
+                                  <verifyIntegrity>false</verifyIntegrity>
+                              </configuration>
+                          </execution>                       
+                          <execution>
+                              <id>default-nbm</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>nbm</goal>
+                              </goals>
+                              <configuration>
+                                  <useOSGiDependencies>true</useOSGiDependencies>
+                                  <cluster>html4j4nb</cluster>
+                                  <verifyIntegrity>false</verifyIntegrity>
+                              </configuration>
+                          </execution>
+                      </executions>
+                      <configuration>
+                          <useOSGiDependencies>true</useOSGiDependencies>
+                          <brandingToken>html4j4nb</brandingToken>
+                          <cluster>html4j4nb</cluster>
+                          <verifyIntegrity>false</verifyIntegrity>
+                      </configuration>
+                  </plugin>                      
+
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-jar-plugin</artifactId>
+                      <configuration>
+                          <!-- to have the jar plugin pickup the nbm generated manifest -->
+                          <useDefaultManifestFile>true</useDefaultManifestFile>
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>      
   </profiles>  
 </project>
diff -r 17aafe5116d5 -r 533c2be1747c 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 27 15:14:48 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 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Thu Mar 27 15:14:48 2014 +0100
@@ -24,7 +24,10 @@
 package org.apidesign.demo.minesweeper;
 
 import net.java.html.boot.BrowserBuilder;
-import org.apidesign.brwsr.IBrwsrPrsntr;
+import org.netbeans.api.nbrwsr.OpenHTMLRegistration;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 
 
 /** Bootstrap and initialization. */
@@ -34,14 +37,36 @@
 
     /** Launches the browser */
     public static void main(String... args) throws Exception {
-        BrowserBuilder.newBrowser(new IBrwsrPrsntr()).
+        BrowserBuilder.newBrowser(new org.apidesign.brwsr.IBrwsrPrsntr()).
             loadPage("pages/index.html").
-            loadClass(Main.class).
-            invoke("onPageLoad", args).
+            loadClass(MinesModel.class).
+            invoke("main", args).
             showAndWait();
         System.exit(0);
     }
     
+    //
+    // the following annotations generate registration for NetBeans,
+    // they are harmless in other packaging schemes
+    //
+    
+    @ActionID(
+            category = "Games",
+            id = "org.apidesign.demo.minesweeper"
+    )
+    @OpenHTMLRegistration(
+        url="index.html",
+        displayName = "Play Minesweeper!",
+        iconBase = "org/apidesign/demo/minesweeper/ko4j.png"
+    )
+    @ActionReferences({
+        @ActionReference(path = "Menu/Window"),
+        @ActionReference(path = "Toolbars/Games")
+    })
+    //
+    // end of NetBeans actions registration
+    //
+    
     /** Called when page is ready */
     public static void onPageLoad() throws Exception {
         Mines m = new Mines();
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Thu Mar 27 15:14:48 2014 +0100
@@ -26,7 +26,7 @@
 public class MainBrwsr {
     static {
         try {
-            Main.onPageLoad();
+            MinesModel.main();
         } catch (Exception ex) {
             throw new IllegalStateException(ex);
         }
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Thu Mar 27 15:14:48 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;
     }
@@ -231,7 +231,7 @@
         }
     }
     
-    private static final AudioClip TOUCH = AudioClip.create("move.mp3");
+    private static AudioClip TOUCH;
     @Function static void click(Mines model, Square data) {
         if (model.getState() != GameState.IN_PROGRESS) {
             return;
@@ -243,6 +243,9 @@
                     showAllBombs(model, SquareType.EXPLOSION);
                     model.setState(GameState.LOST);
                 } else {
+                    if (TOUCH == null) {
+                        TOUCH = AudioClip.create("move.mp3");
+                    }
                     TOUCH.play();
                     expandKnown(model, data);
                     model.computeMines();
@@ -308,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 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/resources/org/apidesign/demo/minesweeper/index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/src/main/resources/org/apidesign/demo/minesweeper/index.html	Thu Mar 27 15:14:48 2014 +0100
@@ -0,0 +1,35 @@
+<!--
+
+    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.
+
+-->
+<html>
+    <head>
+        <title>Dummy Page</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    </head>
+    <body>
+        <div>Opps, this is not what you wanted to see!</div>
+    </body>
+</html>
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/resources/org/apidesign/demo/minesweeper/ko4j.png
Binary file minesweeper/src/main/resources/org/apidesign/demo/minesweeper/ko4j.png has changed
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/webapp/pages/index.html
--- a/minesweeper/src/main/webapp/pages/index.html	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/index.html	Thu Mar 27 15:14:48 2014 +0100
@@ -26,7 +26,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title></title>
+        <title>Minesweeper</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <link href="bootstrap.css" rel="stylesheet">
         <link href="bootstrap-responsive.css" rel="stylesheet">
@@ -126,7 +126,7 @@
               our documentation.
           </p>
           <p><a class="btn btn-default"
-                target="_blank" href="http://bits.netbeans.org/html4j/0.7.5/"
+                target="_blank" href="http://bits.netbeans.org/html+java/0.7.6/"
                 role="button">Read more &raquo;</a></p>
        </div>
         <div class="col-md-4">
@@ -142,8 +142,10 @@
                 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');
diff -r 17aafe5116d5 -r 533c2be1747c minesweeper/src/main/webapp/pages/mines.css
--- a/minesweeper/src/main/webapp/pages/mines.css	Thu Mar 27 09:57:14 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/mines.css	Thu Mar 27 15:14:48 2014 +0100
@@ -45,6 +45,12 @@
     font-size:4em;
 }
 
+table.field td div {
+    position: relative;
+    left: 0;
+    top: 0;
+}
+
 table.field td.UNKNOWN {
     background-color: #D6E4E1;
     cursor: pointer;
diff -r 17aafe5116d5 -r 533c2be1747c pom.xml
--- a/pom.xml	Thu Mar 27 09:57:14 2014 +0100
+++ b/pom.xml	Thu Mar 27 15:14:48 2014 +0100
@@ -13,8 +13,9 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>0.8</net.java.html.version>
+      <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>