# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1398423340 -7200
# Node ID f4d6b81c2f07545253e86f1e141ef294c2ec1dd5
# Parent  dad4f0d41b9f5810d0d03ba3cebf18ea52cace33# Parent  bc6545eceeb1405641091a1448396aceac1acd82
Merging with default branch

diff -r dad4f0d41b9f -r f4d6b81c2f07 minesweeper/pom.xml
--- a/minesweeper/pom.xml	Thu Apr 24 12:37:28 2014 +0200
+++ b/minesweeper/pom.xml	Fri Apr 25 12:55:40 2014 +0200
@@ -4,7 +4,7 @@
 
   <groupId>org.apidesign.demo</groupId>
   <artifactId>minesweeper</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
       <artifactId>demo</artifactId>
@@ -13,7 +13,15 @@
   </parent>
 
   <name>Mine Sweeper</name>
-
+  <description>
+      Demonstration of DukeScript rendering technology.
+      Plus old, good, simple and entertaining game.
+      Improve your coding skills by playing a game and 
+      meanwhile learn what a rendering technology of the
+      future is going to look like. Learn to use DukeScript:
+      Write once, display (and deploy) anywhere!
+  </description>
+  <url>http://html.java.net/</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <brwsr.startpage>pages/index.html</brwsr.startpage>
@@ -33,30 +41,6 @@
           </plugin>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>2.6</version>
-              <executions>
-                  <execution>
-                      <id>copy-resources</id>
-                      <!-- here the phase you need -->
-                      <phase>process-resources</phase>
-                      <goals>
-                          <goal>copy-resources</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${basedir}/target/classes/org/apidesign/demo/minesweeper/</outputDirectory>
-                          <resources>          
-                              <resource>
-                                  <directory>src/main/webapp/</directory>
-                                  <filtering>true</filtering>
-                              </resource>
-                          </resources>              
-                      </configuration>            
-                  </execution>
-              </executions>
-          </plugin>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-jar-plugin</artifactId>
               <version>2.4</version>
               <configuration>
@@ -133,6 +117,20 @@
           <build>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <mainClass>${project.mainclass}</mainClass>
+                                <addClasspath>true</addClasspath>
+                                <classpathPrefix>lib/</classpathPrefix>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.4</version>
                     <executions>
@@ -172,6 +170,20 @@
           <build>
               <plugins>
                   <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-jar-plugin</artifactId>
+                      <version>2.4</version>
+                      <configuration>
+                          <archive>
+                              <manifest>
+                                  <mainClass>${project.mainclass}</mainClass>
+                                  <addClasspath>true</addClasspath>
+                                  <classpathPrefix>lib/</classpathPrefix>
+                              </manifest>
+                          </archive>
+                      </configuration>
+                  </plugin>
+                  <plugin>
                       <groupId>org.apidesign.bck2brwsr</groupId>
                       <artifactId>bck2brwsr-maven-plugin</artifactId>
                       <version>${bck2brwsr.version}</version>
@@ -489,7 +501,7 @@
                               <configuration>
                                   <useOSGiDependencies>true</useOSGiDependencies>
                                   <brandingToken>html4j4nb</brandingToken>
-                                  <cluster>html4j4nb</cluster>
+                                  <cluster>extra</cluster>
                                   <verifyIntegrity>false</verifyIntegrity>
                               </configuration>
                           </execution>                       
@@ -501,7 +513,7 @@
                               </goals>
                               <configuration>
                                   <useOSGiDependencies>true</useOSGiDependencies>
-                                  <cluster>html4j4nb</cluster>
+                                  <cluster>extra</cluster>
                                   <verifyIntegrity>false</verifyIntegrity>
                               </configuration>
                           </execution>
diff -r dad4f0d41b9f -r f4d6b81c2f07 minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Thu Apr 24 12:37:28 2014 +0200
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Fri Apr 25 12:55:40 2014 +0200
@@ -193,6 +193,8 @@
         if (!emptyHidden) {
             model.setState(GameState.WON);
             showAllBombs(model, SquareType.DISCOVERED);
+            AudioClip applause = AudioClip.create("applause.wav");
+            applause.play();
         }
     }
     
@@ -231,7 +233,6 @@
         }
     }
     
-    private static AudioClip TOUCH;
     @Function static void click(Mines model, Square data) {
         if (model.getState() != GameState.IN_PROGRESS) {
             return;
@@ -242,11 +243,11 @@
                 if (data.isMine()) {
                     showAllBombs(model, SquareType.EXPLOSION);
                     model.setState(GameState.LOST);
+                    AudioClip oops = AudioClip.create("oops.wav");
+                    oops.play();
                 } else {
-                    if (TOUCH == null) {
-                        TOUCH = AudioClip.create("move.mp3");
-                    }
-                    TOUCH.play();
+                    AudioClip touch = AudioClip.create("move.mp3");
+                    touch.play();
                     expandKnown(model, data);
                     model.computeMines();
                 }
diff -r dad4f0d41b9f -r f4d6b81c2f07 minesweeper/src/main/webapp/pages/applause.wav
Binary file minesweeper/src/main/webapp/pages/applause.wav has changed
diff -r dad4f0d41b9f -r f4d6b81c2f07 minesweeper/src/main/webapp/pages/index.html
--- a/minesweeper/src/main/webapp/pages/index.html	Thu Apr 24 12:37:28 2014 +0200
+++ b/minesweeper/src/main/webapp/pages/index.html	Fri Apr 25 12:55:40 2014 +0200
@@ -126,7 +126,7 @@
               our documentation.
           </p>
           <p><a class="btn btn-default"
-                target="_blank" href="http://bits.netbeans.org/html+java/0.7.6/"
+                target="_blank" href="http://bits.netbeans.org/html+java/"
                 role="button">Read more &raquo;</a></p>
        </div>
         <div class="col-md-4">
diff -r dad4f0d41b9f -r f4d6b81c2f07 minesweeper/src/main/webapp/pages/oops.wav
Binary file minesweeper/src/main/webapp/pages/oops.wav has changed
diff -r dad4f0d41b9f -r f4d6b81c2f07 pom.xml
--- a/pom.xml	Thu Apr 24 12:37:28 2014 +0200
+++ b/pom.xml	Fri Apr 25 12:55:40 2014 +0200
@@ -13,7 +13,7 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>0.7.6</net.java.html.version>
+      <net.java.html.version>0.8</net.java.html.version>
       <bck2brwsr.version>0.8.1</bck2brwsr.version>
       <teavm.version>0.1</teavm.version>
       <license>COPYING</license>