JBEAP-5460 Rename hibernate5 QS to hibernate

.gitignore

@@ -1,10 +1,6 @@
 *~
 target
 .DS_Store
-.faces-config.xml.faceside
-.faces-config.xml.jsfdia
-.tern-project
-MANIFEST.MF
 bin
 .openshift
 */.gitignore
@@ -15,13 +11,6 @@ SERVICES.html
 CHANGES.html
 CONTRIBUTING.html
 RELEASE_PROCEDURE.html
-.errai
-helloworld-gwt/src/main/gwt-unitCache
-helloworld-gwt/src/main/webapp/HelloWorldApp
-helloworld-gwt/src/main/webapp/WEB-INF/deploy
-helloworld-errai/src/main/gwt-unitCache
-helloworld-errai/src/main/webapp/HelloWorldApp
-helloworld-errai/src/main/webapp/WEB-INF/deploy
 out
 .idea
 *.ipr
@@ -34,10 +23,6 @@ atlassian-ide-plugin.xml
 .settings
 .metadata
 .factorypath
-bin
 .nbattrs
 *.log
-.clover
-*.swp
-!/wicket-war/src/main/resources/META-INF/MANIFEST.MF
 build.metadata

hibernate5/README.md → hibernate/README.md

@@ -1,15 +1,15 @@
-# hibernate5: How to Use Hibernate 5 in an Application
+# hibernate: How to Use Hibernate 5 in an Application
 
 Author: Madhumita Sadhukhan  
 Level: Intermediate  
-Technologies: Hibernate 5  
-Summary: The `hibernate5` quickstart demonstrates how to use Hibernate ORM 5 API over JPA, using Hibernate-Core and Hibernate Bean Validation, and EJB.
-Target Product: ${product.name}  
+Technologies: Hibernate
+Summary: The `hibernate` quickstart demonstrates how to use Hibernate ORM 5 API over JPA, using Hibernate-Core and Hibernate Bean Validation, and EJB.
+Target Product: ${product.name}
 Source: <${github.repo.url}>  
 
 ## What is it?
 
-The `hibernate5` quickstart is based upon the [kitchensink](../kitchensink/README.md) example, but demonstrates how to use Hibernate Object/Relational Mapping (ORM) 5 over JPA in ${product.name.full}.
+The `hibernate` quickstart is based upon the [kitchensink](../kitchensink/README.md) example, but demonstrates how to use Hibernate Object/Relational Mapping (ORM) 5 over JPA in ${product.name.full}.
 
 This project is setup to allow you to create a compliant Java EE 7 application using JSF, CDI, EJB, JPA , Hibernate-Core and Hibernate Bean Validation.  It includes a persistence unit associated with Hibernate session and some sample persistence and transaction code to help you with database access in enterprise Java.
 
@@ -37,7 +37,7 @@ If you use Hibernate 5 packaged within ${product.name}, you will need to first i
 
 This quickstart demonstrates usage of Hibernate Session and Hibernate Validators.
 
-If you look at the pom.xml file in the root of the hibernate5 quickstart directory, you will see that the dependencies for the Hibernate modules have been added with the scope as `provided`.
+If you look at the pom.xml file in the root of the hibernate quickstart directory, you will see that the dependencies for the Hibernate modules have been added with the scope as `provided`.
 For example:
 
       <dependency>

hibernate5/pom.xml → hibernate/pom.xml

@@ -24,9 +24,9 @@
         <version>11.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>hibernate5</artifactId>
+    <artifactId>hibernate</artifactId>
     <packaging>war</packaging>
-    <name>${qs.name.prefix} hibernate5</name>
+    <name>${qs.name.prefix} hibernate</name>
     <description>This project demonstrates how to use Hibernate 5</description>
 
     <licenses>

hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java → hibernate/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java

@@ -57,7 +57,7 @@ public class Member implements Serializable {
     private String name;
 
     /**
-     * using hibernate5 validators
+     * using hibernate validators
      **/
     @NotNull
     @NotEmpty

hibernate5/src/main/resources/META-INF/persistence.xml → hibernate/src/main/resources/META-INF/persistence.xml

@@ -23,9 +23,9 @@
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed
          data source, this example data source is just for development and testing! -->
-      <!-- The datasource is deployed as WEB-INF/hibernate5-quickstart-ds.xml, you
-         can find it in the source at src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml -->
-      <jta-data-source>java:jboss/datasources/Hibernate5QuickstartDS</jta-data-source>
+      <!-- The datasource is deployed as WEB-INF/hibernate-quickstart-ds.xml, you
+         can find it in the source at src/main/webapp/WEB-INF/hibernate-quickstart-ds.xml -->
+      <jta-data-source>java:jboss/datasources/HibernateQuickstartDS</jta-data-source>
       <properties>
          <!-- Properties for Hibernate -->
          <property name="hibernate.hbm2ddl.auto" value="create-drop" />

hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml → hibernate/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml

@@ -24,10 +24,10 @@
    xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
    <!-- The datasource is bound into JNDI at this location. We reference
       this in META-INF/persistence.xml -->
-   <datasource jndi-name="java:jboss/datasources/Hibernate5QuickstartDS"
-      pool-name="hibernate5-quickstart" enabled="true"
+   <datasource jndi-name="java:jboss/datasources/HibernateQuickstartDS"
+      pool-name="hibernate-quickstart" enabled="true"
       use-java-context="true">
-      <connection-url>jdbc:h2:mem:hibernate5-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
+      <connection-url>jdbc:h2:mem:hibernate-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
       <driver>h2</driver>
       <security>
          <user-name>sa</user-name>

hibernate5/src/main/webapp/WEB-INF/templates/default.xhtml → hibernate/src/main/webapp/WEB-INF/templates/default.xhtml

@@ -20,7 +20,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:ui="http://java.sun.com/jsf/facelets">
 <h:head>
-   <title>hibernate5</title>
+   <title>hibernate</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <h:outputStylesheet name="css/screen.css" />
 </h:head>

pom.xml

@@ -459,7 +459,7 @@
                 <module>helloworld-singleton</module>
                 <module>helloworld-ws</module>
                 <module>hibernate4</module>
-                <module>hibernate5</module>
+                <module>hibernate</module>
                 <module>inter-app</module>
                 <module>jaxrs-client</module>
                 <module>jaxws-addressing</module>