JDF-403: Move kitchensink-spring-* subprojects to top level and prefi…

…x the names with kitchen-sink

kitchensink-spring/asyncrequestmapping/README.md → kitchensink-spring-asyncrequestmapping/README.md

@@ -1,4 +1,4 @@
-asyncrequestmapping: Kitchensink AsynRequestMapping Example using Spring 3.2
+kitchensink-spring-asyncrequestmapping: Kitchensink AsynRequestMapping Example using Spring 3.2
 ====================================================================================
 Author: Marius Bogoevici/Tejas Mehta
 Level: Intermediate
@@ -45,9 +45,8 @@ _NOTE: The following build command assumes you have configured your Maven user s
 
         mvn clean package jboss-as:deploy
 
-4. This will deploy module/target/jboss-as-kitchensink-spring-asyncrequestmapping.war to the running instance of the server.
+4. This will deploy `target/jboss-as-kitchensink-spring-asyncrequestmapping.war` to the running instance of the server.
 
-If you don't have maven configured you can manually copy module/target/jboss-as-kitchensink-spring-asyncrequestmapping.war to JBOSS_HOME/standalone/deployments.
 
 Access the application
 ----------------------
@@ -63,7 +62,6 @@ Undeploy the Archive
 
         mvn jboss-as:undeploy
 
-Or you can manually remove the application by removing jboss-as-kitchensink-spring-asyncrequestmapping.war from JBOSS_HOME/standalone/deployments
 
 Run the Quickstart in JBoss Developer Studio or Eclipse
 -------------------------------------

kitchensink-spring/asyncrequestmapping/pom.xml → kitchensink-spring-asyncrequestmapping/pom.xml

@@ -18,12 +18,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <parent>
-        <artifactId>jboss-as-kitchensink-spring</artifactId>
-        <groupId>org.jboss.as.quickstarts</groupId>
-        <version>7.1.2-SNAPSHOT</version>
-    </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jboss.as.quickstarts</groupId>
     <artifactId>jboss-as-kitchensink-spring-asyncrequestmapping</artifactId>
@@ -41,6 +35,120 @@
         </license>
     </licenses>
 
+    <properties>
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: -->
+        <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
+            resources, i.e. build is platform dependent! -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- JBoss dependency versions -->
+
+        <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
+
+        <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
+        <version.jboss.bom>1.0.7.CR8</version.jboss.bom>
+        <!-- Alternatively, comment out the above line, and un-comment the
+            line below to use version 1.0.4.Final-redhat-4 which is a release certified
+            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
+            maven repository. -->
+        <!-- <version.jboss.bom>1.0.4.Final-redhat-4</version.jboss.bom>  -->
+
+        <!-- maven-compiler-plugin -->
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <version.maven.surefire>2.4.3</version.maven.surefire>
+        <version.maven.war>2.2</version.maven.war>
+        <version.maven.compiler>2.4</version.maven.compiler>
+
+        <!-- Third Party Spring dependencies -->
+        <version.standard.taglibs>1.1.2</version.standard.taglibs>
+        <version.commons.logging>1.1.1</version.commons.logging>
+        <version.cglib>2.2</version.cglib>
+        <version.h2db>1.3.165</version.h2db>
+        <version.jackson>1.9.3</version.jackson>
+        <version.slf4j>1.6.4</version.slf4j>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- JBoss distributes a complete set of Java EE 6 APIs including
+                a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
+                a collection) of artifacts. We use this here so that we always get the correct
+                versions of artifacts. Here we use the jboss-javaee-6.0-with-tools stack
+                (you can read this as the JBoss stack of the Java EE 6 APIs, with some extras
+                tools for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
+                stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
+                from the Hibernate family of projects) -->
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-spring</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-tools</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                <version>${version.standard.taglibs}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${version.commons.logging}</version>
+            </dependency>
+
+            <!-- Add cglib for the MemberDaoTest -->
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>${version.cglib}</version>
+            </dependency>
+
+            <!-- Add H2 dependency for embedded testing database -->
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${version.h2db}</version>
+            </dependency>
+
+            <!-- Add JSON dependency, specified in jboss-deployment-structure.xml -->
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${version.slf4j}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <!-- Import the JPA API using the provided scope It is included in JBoss
@@ -207,9 +315,6 @@
                 <groupId>org.jboss.as.plugins</groupId>
                 <artifactId>jboss-as-maven-plugin</artifactId>
                 <version>${version.jboss.maven.plugin}</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
             </plugin>
             <!-- Surefire plugin before 2.9 version is buggy -->
             <plugin>

kitchensink-spring/basic/README.md → kitchensink-spring-basic/README.md

@@ -1,4 +1,4 @@
-basic: Kitchensink Example using Spring 3.1
+kitchensink-spring-basic: Kitchensink Example using Spring 3.1
 ===========================================
 Author: Marius Bogoevici
 Level: Intermediate
@@ -52,9 +52,8 @@ _NOTE: The following build command assumes you have configured your Maven user s
 
         mvn clean package jboss-as:deploy
 
-4. This will deploy module/target/jboss-as-kitchensink-spring-basic.war to the running instance of the server.
+4. This will deploy `target/jboss-as-kitchensink-spring-basic.war` to the running instance of the server.
 
-If you don't have maven configured you can manually copy module/target/jboss-as-kitchensink-spring-basic.war to JBOSS_HOME/standalone/deployments.
 
 Access the application
 ----------------------
@@ -70,7 +69,6 @@ Undeploy the Archive
 
         mvn jboss-as:undeploy
 
-Or you can manually remove the application by removing jboss-as-kitchensink-spring-basic.war from JBOSS_HOME/standalone/deployments
 
 Run the Quickstart in JBoss Developer Studio or Eclipse
 -------------------------------------

kitchensink-spring/basic/pom.xml → kitchensink-spring-basic/pom.xml

@@ -17,11 +17,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>jboss-as-kitchensink-spring</artifactId>
-        <groupId>org.jboss.as.quickstarts</groupId>
-        <version>7.1.2-SNAPSHOT</version>
-    </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jboss.as.quickstarts</groupId>
@@ -41,12 +36,120 @@
     </licenses>
 
     <properties>
-        <!-- Explicitly declaring the source encoding eliminates the following message: -->
+        <!-- Explicitly declaring the source encoding eliminates the following
+            message: -->
         <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-        resources, i.e. build is platform dependent! -->
+            resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- JBoss dependency versions -->
+
+        <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
+
+        <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
+        <version.jboss.bom>1.0.7.CR8</version.jboss.bom>
+        <!-- Alternatively, comment out the above line, and un-comment the
+            line below to use version 1.0.4.Final-redhat-4 which is a release certified
+            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
+            maven repository. -->
+        <!-- <version.jboss.bom>1.0.4.Final-redhat-4</version.jboss.bom>  -->
+
+        <!-- maven-compiler-plugin -->
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <version.maven.surefire>2.4.3</version.maven.surefire>
+        <version.maven.war>2.2</version.maven.war>
+        <version.maven.compiler>2.4</version.maven.compiler>
+
+        <!-- Third Party Spring dependencies -->
+        <version.standard.taglibs>1.1.2</version.standard.taglibs>
+        <version.commons.logging>1.1.1</version.commons.logging>
+        <version.cglib>2.2</version.cglib>
+        <version.h2db>1.3.165</version.h2db>
+        <version.jackson>1.9.3</version.jackson>
+        <version.slf4j>1.6.4</version.slf4j>
     </properties>
 
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- JBoss distributes a complete set of Java EE 6 APIs including
+                a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
+                a collection) of artifacts. We use this here so that we always get the correct
+                versions of artifacts. Here we use the jboss-javaee-6.0-with-tools stack
+                (you can read this as the JBoss stack of the Java EE 6 APIs, with some extras
+                tools for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
+                stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
+                from the Hibernate family of projects) -->
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-spring</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-6.0-with-tools</artifactId>
+                <version>${version.jboss.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                <version>${version.standard.taglibs}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${version.commons.logging}</version>
+            </dependency>
+
+            <!-- Add cglib for the MemberDaoTest -->
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>${version.cglib}</version>
+            </dependency>
+
+            <!-- Add H2 dependency for embedded testing database -->
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${version.h2db}</version>
+            </dependency>
+
+            <!-- Add JSON dependency, specified in jboss-deployment-structure.xml -->
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${version.slf4j}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- Import the JPA API using the provided scope It is included in JBoss
             AS 7 / EAP 6 -->
@@ -212,9 +315,6 @@
                 <groupId>org.jboss.as.plugins</groupId>
                 <artifactId>jboss-as-maven-plugin</artifactId>
                 <version>${version.jboss.maven.plugin}</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
             </plugin>
             <!-- Surefire plugin before 2.9 version is buggy -->
             <plugin>

kitchensink-spring/controlleradvice/README.md → kitchensink-spring-controlleradvice/README.md

@@ -1,4 +1,4 @@
-controlleradvice: Kitchensink ControllerAdvice Example using Spring 3.2
+kitchensink-spring-controlleradvice: Kitchensink ControllerAdvice Example using Spring 3.2
 ===================================================================================
 Author: Marius Bogoevici/Tejas Mehta
 Level: Intermediate
@@ -47,9 +47,8 @@ _NOTE: The following build command assumes you have configured your Maven user s
 
         mvn clean package jboss-as:deploy
 
-4. This will deploy module/target/jboss-as-kitchensink-spring-controlleradvice.war to the running instance of the server.
+4. This will deploy `target/jboss-as-kitchensink-spring-controlleradvice.war` to the running instance of the server.
 
-If you don't have maven configured you can manually copy module/target/jboss-as-kitchensink-spring-controlleradvice.war to JBOSS_HOME/standalone/deployments.
 
 Access the application
 ----------------------
@@ -65,7 +64,6 @@ Undeploy the Archive
 
         mvn jboss-as:undeploy
 
-Or you can manually remove the application by removing jboss-as-kitchensink-spring-controlleradvice.war from JBOSS_HOME/standalone/deployments
 
 Run the Quickstart in JBoss Developer Studio or Eclipse
 -------------------------------------