MODE-2543 Updates the quickstarts to Wildfly 10 and ModeShape 5

README.md

@@ -10,8 +10,8 @@ Each quickstart is a small, specific, focused, working example that can be used
 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 9.
+All you need to build the quickstarts is Java 8.0 (Java SDK 1.8) or better, Maven 3.0 or better. Each quickstart
+produces a web application (WAR) that is designed to be run on JBoss Wildfly 9 or 10.
 
 Contents
 --------
@@ -32,9 +32,9 @@ for help on how to install and configure Maven 3._
 
 To create a zip distribution with all the quickstarts, run the following Maven command:
 
-        mvn clean install -Pdist
+        mvn clean verify -Pdist
 
-The output will be placed in the [dist/target](dist/target) folder.
+The output will be placed in the [target](target) folder.
 
 The ModeShape project
 ---------------------

dist/src/main/assembly/assembly.xml → assembly.xml

@@ -9,9 +9,10 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/..</directory>
+            <directory>.</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
+                <exclude>assembly.xml</exclude>
                 <exclude>**/*.war</exclude>
                 <exclude>dist/**</exclude>
                 <exclude>template/**</exclude>

modeshape-cdi/README.md

@@ -11,36 +11,21 @@ a JSF application, using only CDI.
 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 9.
+All you need to build this project is Java 8.0 (Java SDK 1.8) or better, Maven 3.0 or better.
+The application this project produces is designed to be run on JBoss Wildfly 9 or 10.
 
-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)
-
-Start JBoss Wildfly with the ModeShape configuration
---------------------------------------------------------------------------------
-
-1. Open a command line and navigate to the root of the JBoss server directory.
-2. The following shows the command line to start the server with the ModeShape profile:
-
-        For Linux:   JBOSS_HOME/bin/standalone.sh -c standalone-modeshape.xml
-        For Windows: JBOSS_HOME\bin\standalone.bat -c standalone-modeshape.xml
-
-Build and Deploy the Quickstart
+Running the Quickstart
 -------------------------
 _NOTE: The following build command assumes you have configured your Maven user settings. If you have not, you must use the `settings.xml`
 file from the root of this project. See [this ModeShape community article](http://community.jboss.org/wiki/ModeShapeandMaven)
 for help on how to install and configure Maven 3._
 
-1. Make sure you have started the JBoss Server as described above.
-2. Open a command line and navigate to the root directory of this quickstart.
-3. Type this command to build and deploy the archive:
+1. Open a command line and navigate to the root directory of this quickstart.
+2. Type this command to build and deploy the archive:
 
-        mvn clean package wildfly:deploy
+        mvn clean package
 
-4. This will deploy `target/modeshape-cdi.war` to the running instance of the server.
+3. This will start a local Wildfly instance located at `target\wildfly', unpack and copy the ModeShape WF kit and deploy `target/modeshape-cdi.war` to the running instance of the server.
 
 Accessing the application
 ---------------------
@@ -59,27 +44,17 @@ based on which one of the following actions can be performed
 1. Show children - displays the children of node located at "Parent Absolute Path"
 2. Add Node - add a new child with the given name under the node located at "Parent Absolute Path"
 
-Undeploy the Archive
---------------------
-
-1. Make sure you have started the JBoss Server as described above.
-2. Open a command line and navigate to the root directory of this quickstart.
-3. When you are finished testing, type this command to undeploy the archive:
-
-        mvn wildfly:undeploy
-
 Run the Arquillian Tests
 -------------------------
 
-This quickstart provides Arquillian tests. By default, these tests are configured to be skipped as Arquillian tests require the use of a container.
+This quickstart provides some optional Arquillian tests. These are part of separate profile and can be run like so: 
 
-1. Make sure you have started the JBoss Server as described above.
-2. Open a command line and navigate to the root directory of this quickstart.
-3. Type the following command to run the test goal with the following profile activated:
+1. Open a command line and navigate to the root directory of this quickstart.
+2. Type the following command to run the tests:
 
-        mvn clean package -Parq-jbossas-remote
+        mvn clean verify -Pdist
 
-The above command will run the tests using the predefined repository named `sample` (see above).
+The above command will start a server with the ModeShape WF kit deployed and run the tests using the predefined repository named `sample` (see above).
 
 The ModeShape project
 ---------------------