MODE-2488 Updated the quickstarts for Wildfly 9 compatibility.

README.md

@@ -11,7 +11,7 @@ System requirements
 -------------------
 
 All you need to build the quickstarts is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better. Each quickstart
-produces a web application (WAR) that is designed to be run on JBoss Wildfly 8.
+produces a web application (WAR) that is designed to be run on JBoss Wildfly 9.
 
 Contents
 --------

dist/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-quickstarts-dist</artifactId>
-    <version>4.3.0.Final</version>
+    <version>4.4-SNAPSHOT</version>
     <name>ModeShape AS Quickstarts Distribution</name>
     <description>POM for building the quickstarts distribution.</description>
     <url>http://www.modeshape.org</url>

modeshape-cdi/README.md

@@ -12,9 +12,9 @@ System requirements
 -------------------
 
 All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Wildfly 8.
+The application this project produces is designed to be run on JBoss Wildfly 9.
 
-Install ModeShape's AS kit into an existing Wildfly 8 server
+Install ModeShape's AS kit into an existing Wildfly server
 -----------------------------------------------------
 Before running this demo make sure that you have installed the ModeShape Wildfly kit into an existing JBoss Wildfly server.
 The simplest way to do this is to follow the instructions provided [here](https://docs.jboss.org/author/display/MODE/Installing+ModeShape+into+AS7)

modeshape-cdi/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cdi</artifactId>
-    <version>4.3.0.Final</version>
+    <version>4.4-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses ModeShape via CDI</name>
     <description>
@@ -26,10 +26,10 @@
         <version.resources.plugin>2.6</version.resources.plugin>
         <version.surefire.plugin>2.12.3</version.surefire.plugin>
         <version.war.plugin>2.3</version.war.plugin>
-        <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.3.0.Final</version.modeshape>
+        <version.modeshape>4.4-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -213,7 +213,7 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>

modeshape-cdi/src/main/java/org/modeshape/quickstart/cdi/CDIController.java

@@ -16,7 +16,6 @@
 
 package org.modeshape.quickstart.cdi;
 
-import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.TreeSet;
 import javax.enterprise.context.RequestScoped;

modeshape-cli/README.md

@@ -12,7 +12,7 @@ System requirements
 -------------------
 
 All you need to build this project is Java 7.0 (Java SDK 1.7) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Wildfly 8.
+The application this project produces is designed to be run on JBoss Wildfly 9.
 
 Install ModeShape's AS kit into an existing JBoss Wildfly server
 -----------------------------------------------------

modeshape-cli/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cli</artifactId>
-    <version>4.3.0.Final</version>
+    <version>4.4-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses CLI scripts to create and remove a repository</name>
     <description>
@@ -26,10 +26,10 @@
         <version.resources.plugin>2.6</version.resources.plugin>
         <version.surefire.plugin>2.12.3</version.surefire.plugin>
         <version.war.plugin>2.3</version.war.plugin>
-        <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.3.0.Final</version.modeshape>
+        <version.modeshape>4.4-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -200,6 +200,10 @@
             </build>
         </profile>
         <profile>
+            <!-- 
+                Not working properly because of https://issues.jboss.org/browse/WFCORE-533
+                i.e. you can't reload automatically and wait for the reloading to finish
+            -->
             <id>run-scripts-automatically</id>
             <build>
                 <plugins>
@@ -214,7 +218,7 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <executions>
-                            <!--Undeploy the application on clean & Remove the test repository and ISPN caches-->
+                            <!--Undeploy the application on clean & Remove the test repository -->
                             <execution>
                                 <id>undeploy</id>
                                 <phase>clean</phase>
@@ -224,8 +228,8 @@
                                     <goal>shutdown</goal>
                                 </goals>
                                 <configuration>
-                                    <ignoreMissingDeployment>true</ignoreMissingDeployment>
                                     <reload>true</reload>
+                                    <ignoreMissingDeployment>true</ignoreMissingDeployment>
                                     <execute-commands>
                                         <batch>false</batch>
                                         <scripts>
@@ -235,16 +239,14 @@
                                 </configuration>
                             </execution>
 
-                            <!--Create the test repository and ISPN caches, and reload the repository-->
+                            <!--Create the test repository  and reload the repository-->
                             <execution>
                                 <id>create-test-repository</id>
                                 <goals>
                                     <goal>execute-commands</goal>
-                                    <goal>shutdown</goal>
                                 </goals>
-                                <phase>validate</phase>
+                                <phase>compile</phase>
                                 <configuration>
-                                    <reload>true</reload>
                                     <execute-commands>
                                         <scripts>
                                             <script>src/main/resources/create-repository.cli</script>
@@ -265,7 +267,7 @@
             <id>arq-jbossas-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>

modeshape-cli/src/main/resources/create-repository.cli

@@ -8,19 +8,8 @@ if (outcome != success) of /subsystem=modeshape:read-resource
   /subsystem=modeshape:add
 end-if
 
-# Check if the test setup needs creating
-if (outcome != success) of /subsystem=infinispan/cache-container=modeshape-test:read-resource
-    # Setup Infinispan
-    /subsystem=infinispan/cache-container=modeshape-test:add
-    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli:add
-    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/transaction=TRANSACTION:add(mode=NON_XA)
-    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/locking=LOCKING:add(isolation=READ_COMMITTED)
-    /subsystem=infinispan/cache-container=modeshape-test/local-cache=test-cli/file-store=FILE_STORE:add(path="modeshape/store/test-cli",passivation=false,purge=false)
-end-if
-
 # Add the test repository
 if (outcome != success) of /subsystem=modeshape/repository=test-cli:read-resource
-    /subsystem=modeshape/repository=test-cli:add(cache-container="modeshape-test")
+    /subsystem=modeshape/repository=test-cli:add(cache-config="modeshape/sample-cache-config.xml",cache-name="sample")    
+    :reload
 end-if
-
-:reload

modeshape-cli/src/main/resources/remove-repository.cli

@@ -1,12 +1,6 @@
 # Remove the test repository if it exists
 if (outcome == success) of /subsystem=modeshape/repository=test-cli:read-resource
     /subsystem=modeshape/repository=test-cli:remove
+    :reload
 end-if
 
-# Remove the Infinispan cache container
-if (outcome == success) of /subsystem=infinispan/cache-container=modeshape-test:read-resource
-    # Setup Infinispan
-    /subsystem=infinispan/cache-container=modeshape-test:remove
-end-if
-
-:reload

modeshape-clustering/README.md

@@ -28,11 +28,11 @@ Start 2 JBoss Wildfly instances with the set of provided configurations (see abo
 
 1. Copy the `standalone` folder from the root of the quickstart into the `JBOSS_HOME`folder
 2. Open a command line and navigate to the root of the JBoss server directory.
-3. Start the `master` server:
+3. Start the first server:
 
         For Linux:   JBOSS_HOME/bin/standalone.sh -c standalone-modeshape-node1.xml
         For Windows: JBOSS_HOME\bin\standalone.bat -c standalone-modeshape-node1.xml
-4. Start the `slave` server:
+4. Start the second server:
 
         For Linux:   JBOSS_HOME/bin/standalone.sh -c standalone-modeshape-node2.xml
         For Windows: JBOSS_HOME\bin\standalone.bat -c standalone-modeshape-node2.xml

modeshape-clustering/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-clustering</artifactId>
-    <version>4.3.0.Final</version>
+    <version>4.4-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses several clustered ModeShape servers</name>
     <description>
@@ -26,10 +26,10 @@
         <version.resources.plugin>2.6</version.resources.plugin>
         <version.surefire.plugin>2.12.3</version.surefire.plugin>
         <version.war.plugin>2.3</version.war.plugin>
-        <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.3.0.Final</version.modeshape>
+        <version.modeshape>4.4-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
@@ -213,7 +213,7 @@
             <id>arq-wildfly-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                 </dependency>
             </dependencies>