Merge branch 'release/3.7'

radcortez · radcortez · commit dd7d6a3c0f07 · 2016-05-24T07:57:09.000+01:00
diff --git a/README.md b/README.md
@@ -27,24 +27,30 @@ few instructions here: [Codenvy setup to demo applications using Docker: Java EE
 
 ### Deploy in Wildfly 8 ###
 
-  * Copy the file javaee7-angular-3.4.war from target directory to your Wildfly installation folder
+  * Copy the file javaee7-angular.war from target directory to your Wildfly installation folder
   `standalone/deployments`
 
   * You can also deploy the app, using Maven Wildfly Plugin with the following command: `mvn wildfly:deploy`.
   You need to have Wildfly running.
 
-  * Start Wildfly 8 and go to http://localhost:8080/javaee7-angular-3.6/ (http://localhost:8080/javaee7-angular-3.6/)
+  * Start Wildfly 8 and go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
 
 ### Deploy in Glassfish 4.1 ###
 
   * Open Admin Console (http://localhost:8484/)
   
   * Go to menu "Application" 
   
-  * In the button "Deploy..." select the file javaee7-angular-3.6.war
+  * In the button "Deploy..." select the file javaee7-angular.war
    
-  * Go to http://localhost:8080/javaee7-angular-3.6/ (http://localhost:8080/javaee7-angular-3.6/)
+  * Go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
+  
+### Deploy in Embedded-Glassfish 3.1 ###
 
+  * You can also deploy the app, using Maven Embedded-Glassfish Plugin with the following command: `mvn embedded-glassfish:run`
+  
+  * Go to http://localhost:8080/javaee7-angular/ (http://localhost:8080/javaee7-angular/)
+  
 ## Javascript Package Management (optional) ##
 
 The required JS libraries are included in the project, but it also possible to manage them following the next steps:
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.cortez.samples</groupId>
     <artifactId>javaee7-angular</artifactId>
-    <version>3.6</version>
+    <version>3.7</version>
     <packaging>war</packaging>
 
     <name>javaee7-angular</name>
@@ -24,6 +24,7 @@
         <version.plugin.jgitflow>1.0-m3</version.plugin.jgitflow>
         <version.plugin.jrebel>1.1.5</version.plugin.jrebel>
         <version.plugin.wildfly>1.1.0.Alpha1</version.plugin.wildfly>
+        <version.plugin.glassfish>4.1.1</version.plugin.glassfish>
 
         <!-- Dependencies -->
         <version.dependency.javaee>7.0</version.dependency.javaee>
@@ -70,6 +71,7 @@
                 <version>${version.plugin.war}</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>javaee7-angular</warName>
                 </configuration>
             </plugin>
 
@@ -101,6 +103,32 @@
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
                 <version>${version.plugin.wildfly}</version>
+                <configuration>
+                    <filename>javaee7-angular.war</filename>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.glassfish.embedded</groupId>
+                <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                <version>${version.plugin.glassfish}</version>
+                <configuration>
+                    <port>8080</port>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <!-- Workaround to force the deploy goal to not execute on pre-integrations-tests -->
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                        <configuration>
+                            <app>target/javaee7-angular.war</app>
+                            <contextRoot>javaee7-angular</contextRoot>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
