Update jboss-html5-mobile-archetype repository to use EAP 7

jboss-developer · Jul 14, 2015 · f5825b5 · f5825b5
1 parent 167ac13
commit f5825b5
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 114 deletions.
diff --git a/jboss-html5-mobile-archetype/pom.xml b/jboss-html5-mobile-archetype/pom.xml
@@ -97,21 +97,18 @@
                            <artifactId>qstools</artifactId>
                            <version>1.6.1.Final</version>
                            <configuration>
-                               <projectGitRepo>https://github.com/jboss-developer/jboss-wfk-quickstarts.git</projectGitRepo>
+                               <projectGitRepo>https://github.com/jboss-developer/jboss-eap-quickstarts.git</projectGitRepo>
                                <projectPath>kitchensink-html5-mobile</projectPath>
                                <rootPackage>org.jboss.as.quickstarts.html5_mobile</rootPackage>
-                               <branch>12d82ed82656d1f5a17c679d3e38e3234692107d</branch>
+                               <branch>7.0.x-develop</branch>
                                <replaceValueWithExpression>
                                    <html5mobi>tableSuffix</html5mobi>
                                </replaceValueWithExpression>
                                <applyPatch>cheatsheet.diff</applyPatch>;
-                               <ignoredArchetypeExpressionReplaceValues>
-                                   <ignoredArchetypeExpressionReplaceValue>http://www.jboss.org/jdf/quickstarts/jboss-as-quickstart/wfk-quickstarts/</ignoredArchetypeExpressionReplaceValue>
-                               </ignoredArchetypeExpressionReplaceValues>
                                <archetypeExpressionReplaceValues>
                                    <archetypeExpressionReplaceValue>jboss-as-kitchensink-html5-mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>jboss-kitchensink-html5-mobile</archetypeExpressionReplaceValue>
-                                   <archetypeExpressionReplaceValue>JBoss WFK Quickstart: kitchensink-html5-mobile</archetypeExpressionReplaceValue>
+                                   <archetypeExpressionReplaceValue>JBoss EAP Quickstart: kitchensink-html5-mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>KitchensinkHTML5MobileQuickstart</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>KitchensinkHTML5Mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>kitchensink-html5-mobile-quickstart</archetypeExpressionReplaceValue>

diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml
@@ -22,7 +22,7 @@
 <cheatsheet title="HTML5 + Mobile + JAX-RS: ${artifactId} quickstart">
   <intro>
     <description>
-      This quickstart shows off HTML5 based desktop/mobile web application development with Java EE 6 on Red Hat JBoss Enterprise Application Platform 6.1 or later. This project uses HTML5, jQuery Mobile, JAX-RS, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+      This quickstart shows off HTML5 based desktop/mobile web application development with Java EE 7 on Red Hat JBoss Enterprise Application Platform 7 or later. This project uses HTML5, jQuery Mobile, JAX-RS 2.0, CDI 1.1, EJB 3.2, JPA 2.1 and Bean Validation 1.1. It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
       <br/><br/>
       <b>HTML5</b>
       <br/><br/>
@@ -34,27 +34,27 @@
       <br/><br/>
       <b>JAX-RS: The Java API for RESTful Web Services</b>
       <br/><br/>
-      JAX-RS is a new specification in Java EE 6. It allows application developers to easily expose Java services as RESTful web services.
+      JAX-RS is a specification in Java EE that allows application developers to easily expose Java services as RESTful web services.
       <br/><br/>
-      <b>EJB 3.1</b>
+      <b>EJB 3.2</b>
       <br/><br/>
-      EJB 3.1 is an update to the EJB specification for Java EE 6. It allows application developers to build business components and services.
+      EJB 3.2 is an update to the EJB specification for Java EE 7. It allows application developers to build business components and services.
       <br/><br/>
-      <b>JPA 2.0</b>
+      <b>JPA 2.1</b>
       <br/><br/>
-      JPA 2.0 is an update to the JPA specification for Java EE 6. It provides application developers with an object-relational mapping facility to manage relational data. 
+      JPA 2.1 is an update to the JPA specification for Java EE 7. It provides application developers with an object-relational mapping facility to manage relational data.
       <br/><br/>
-      <b>Bean Validation</b>
+      <b>Bean Validation 1.1</b>
       <br/><br/>
-      Bean Validation is a new specification in Java EE 6, inspired by Hibernate Validator. It allows application developers to specify constraints once (often in their domain model), and have them applied in all layers of the application, protecting data and giving useful feedback to users.
+      Bean Validation 1.1 is an update to the JPA specification for Java EE 7. It was inspired by Hibernate Validator. It allows application developers to specify constraints once (often in their domain model), and have them applied in all layers of the application, protecting data and giving useful feedback to users.
       <br/><br/>
     </description>
   </intro>
   <item
     skip="false"
     title="The ${artifactId} example in depth">
     <description>
-      The ${artifactId} application shows off a number of Java EE technologies such as HTML5, jQuery Mobile, JAX-RS, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. 
+      The ${artifactId} application shows off a number of Java EE technologies such as HTML5, jQuery Mobile, JAX-RS 2.0, CDI 1.1, EJB 3.2, JPA 2.1 and Bean Validation 1.1.
       It does this by providing a member registration database, available via HTML5 and JAX-RS.
       <br/><br/>
       As usual, let&apos;s start by looking at the necessary deployment descriptors. By now, we&apos;re very used to seeing <b>beans.xml</b> in <b>WEB-INF/</b> (which can be found in the <b>src/main/webapp</b> directory of the example). Notice that, once again, we don&apos;t need a web.xml. There are two configuration files (which can be found in the <b>src/main/resources</b> directory of the example) — <b>WEB-INF/classes/META-INF/persistence.xml</b>, which sets up JPA, and <b>WEB-INF/classes/import.sql</b> which Hibernate, the JPA provider in Red Hat JBoss Enterprise Application Platform, will use to load the initial users into the application when the application starts. We discussed both of these files in detail in The <b>greeter example in depth</b>, and these are largely the same.
@@ -623,7 +623,7 @@
       The following action starts the test in the <b>remote</b> mode because you have started the server in the previous step. 
     <br/>
         Right-click the project, select <b>Properties&gt;Maven</b> and 
-        enter <b>arq-jbossas-remote</b> to the <b>Active Maven Profile</b> field. 
+        enter <b>arq-wildfly-remote</b> to the <b>Active Maven Profile</b> field.
         After that, right-click the project and select <b>Run As&gt;JUnit test</b>.
         <br/><br/>
         After performing this action, you should see a green bar in the <b>JUnit</b> view!
@@ -632,14 +632,14 @@
     <!-- the launchJUnitTest command is not implemented yey
     <command
       required="false"
-      serialization="org.jboss.tools.project.examples.cheatsheet.actions.launchJUnitTest(project=${currentProject}, activateProfile=arq-jbossas-remote)"/>
+      serialization="org.jboss.tools.project.examples.cheatsheet.actions.launchJUnitTest(project=${currentProject}, activateProfile=arq-wildfly-remote)"/>
   -->
 
   <action
       pluginId="org.jboss.tools.project.examples.cheatsheet"
       class="org.jboss.tools.project.examples.cheatsheet.actions.LaunchJUnitTest"
       param1="${currentProject}" 
-        param2="arq-jbossas-remote"/> 
+        param2="arq-wildfly-remote"/>
   </item>
 
   <item
@@ -720,7 +720,7 @@
     First of all, let&apos;s take a look at <b>arquillian.xml</b> in <b>src/test/resources</b>.
     </description>
     <subitem
-            label="Arquillian deploys the test war to JBoss AS, and doesn't write it to disk. For debugging, it can be very useful to see exactly what is in your war, so Arquillian allows you to export the war when the tests runs "
+            label="Arquillian deploys the test war to JBoss EAP, and doesn't write it to disk. For debugging, it can be very useful to see exactly what is in your war, so Arquillian allows you to export the war when the tests runs "
             skip="true">
     <command
       required="false"
@@ -744,7 +744,7 @@
       serialization="org.jboss.tools.project.examples.cheatsheet.openFileInEditor(path=/${currentProject}/pom.xml,fromLine=300,toLine=323)"/>
   </subitem>
   <subitem
-            label="Arquillian decides which container to use depending on your classpath. Here we define the remote JBoss AS container. "
+            label="Arquillian decides which container to use depending on your classpath. Here we define the remote JBoss EAP container. "
             skip="true">
     <command
       required="false"