From 1a98fb38cbe0503440401a185f4854b6f33484e2 Mon Sep 17 00:00:00 2001 From: Tomaz Cerar Date: Tue, 4 Jul 2017 15:49:25 +0200 Subject: [PATCH] JBEAP-5460 Rename hibernate5 QS to hibernate --- .gitignore | 15 --------------- {hibernate5 => hibernate}/README.md | 12 ++++++------ {hibernate5 => hibernate}/pom.xml | 4 ++-- .../hibernate/controller/MemberController.java | 0 .../hibernate/data/MemberListProducer.java | 0 .../hibernate/data/MemberRepository.java | 0 .../as/quickstart/hibernate/model/Member.java | 2 +- .../hibernate/service/MemberRegistration.java | 0 .../as/quickstart/hibernate/util/Resources.java | 0 .../src/main/resources/META-INF/persistence.xml | 6 +++--- .../src/main/resources/import.sql | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/faces-config.xml | 0 .../webapp/WEB-INF/hibernate5-quickstart-ds.xml | 6 +++--- .../main/webapp/WEB-INF/templates/default.xhtml | 2 +- .../src/main/webapp/index.html | 0 .../src/main/webapp/index.xhtml | 0 .../src/main/webapp/resources/css/screen.css | 0 .../src/main/webapp/resources/gfx/asidebkg.png | Bin .../src/main/webapp/resources/gfx/banner.png | Bin .../main/webapp/resources/gfx/bkg-blkheader.png | Bin .../src/main/webapp/resources/gfx/headerbkg.png | Bin .../main/webapp/resources/gfx/rhjb_eap_logo.png | Bin pom.xml | 2 +- 24 files changed, 17 insertions(+), 32 deletions(-) rename {hibernate5 => hibernate}/README.md (88%) rename {hibernate5 => hibernate}/pom.xml (97%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java (100%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberListProducer.java (100%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberRepository.java (100%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java (98%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/service/MemberRegistration.java (100%) rename {hibernate5 => hibernate}/src/main/java/org/jboss/as/quickstart/hibernate/util/Resources.java (100%) rename {hibernate5 => hibernate}/src/main/resources/META-INF/persistence.xml (89%) rename {hibernate5 => hibernate}/src/main/resources/import.sql (100%) rename {hibernate5 => hibernate}/src/main/webapp/WEB-INF/beans.xml (100%) rename {hibernate5 => hibernate}/src/main/webapp/WEB-INF/faces-config.xml (100%) rename {hibernate5 => hibernate}/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml (87%) rename {hibernate5 => hibernate}/src/main/webapp/WEB-INF/templates/default.xhtml (98%) rename {hibernate5 => hibernate}/src/main/webapp/index.html (100%) rename {hibernate5 => hibernate}/src/main/webapp/index.xhtml (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/css/screen.css (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/gfx/asidebkg.png (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/gfx/banner.png (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/gfx/bkg-blkheader.png (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/gfx/headerbkg.png (100%) rename {hibernate5 => hibernate}/src/main/webapp/resources/gfx/rhjb_eap_logo.png (100%) diff --git a/.gitignore b/.gitignore index 8dc560e208..d2f4432613 100644 --- a/.gitignore +++ b/.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 diff --git a/hibernate5/README.md b/hibernate/README.md similarity index 88% rename from hibernate5/README.md rename to hibernate/README.md index 471b8aa4af..2fb3e4f693 100644 --- a/hibernate5/README.md +++ b/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: diff --git a/hibernate5/pom.xml b/hibernate/pom.xml similarity index 97% rename from hibernate5/pom.xml rename to hibernate/pom.xml index d430d4d392..13e3caab45 100644 --- a/hibernate5/pom.xml +++ b/hibernate/pom.xml @@ -24,9 +24,9 @@ 11.0.0-SNAPSHOT ../pom.xml - hibernate5 + hibernate war - ${qs.name.prefix} hibernate5 + ${qs.name.prefix} hibernate This project demonstrates how to use Hibernate 5 diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java similarity index 100% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberListProducer.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberListProducer.java similarity index 100% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberListProducer.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberListProducer.java diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberRepository.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberRepository.java similarity index 100% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberRepository.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/data/MemberRepository.java diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java similarity index 98% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java index cc2a8074b1..53538951bb 100644 --- a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/model/Member.java +++ b/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 diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/service/MemberRegistration.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/service/MemberRegistration.java similarity index 100% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/service/MemberRegistration.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/service/MemberRegistration.java diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/util/Resources.java b/hibernate/src/main/java/org/jboss/as/quickstart/hibernate/util/Resources.java similarity index 100% rename from hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/util/Resources.java rename to hibernate/src/main/java/org/jboss/as/quickstart/hibernate/util/Resources.java diff --git a/hibernate5/src/main/resources/META-INF/persistence.xml b/hibernate/src/main/resources/META-INF/persistence.xml similarity index 89% rename from hibernate5/src/main/resources/META-INF/persistence.xml rename to hibernate/src/main/resources/META-INF/persistence.xml index 67352bf4a2..dd8cf37a3e 100644 --- a/hibernate5/src/main/resources/META-INF/persistence.xml +++ b/hibernate/src/main/resources/META-INF/persistence.xml @@ -23,9 +23,9 @@ - - java:jboss/datasources/Hibernate5QuickstartDS + + java:jboss/datasources/HibernateQuickstartDS diff --git a/hibernate5/src/main/resources/import.sql b/hibernate/src/main/resources/import.sql similarity index 100% rename from hibernate5/src/main/resources/import.sql rename to hibernate/src/main/resources/import.sql diff --git a/hibernate5/src/main/webapp/WEB-INF/beans.xml b/hibernate/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from hibernate5/src/main/webapp/WEB-INF/beans.xml rename to hibernate/src/main/webapp/WEB-INF/beans.xml diff --git a/hibernate5/src/main/webapp/WEB-INF/faces-config.xml b/hibernate/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from hibernate5/src/main/webapp/WEB-INF/faces-config.xml rename to hibernate/src/main/webapp/WEB-INF/faces-config.xml diff --git a/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml b/hibernate/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml similarity index 87% rename from hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml rename to hibernate/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml index c1805f724b..6e41a6d29b 100644 --- a/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml +++ b/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"> - - jdbc:h2:mem:hibernate5-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 + jdbc:h2:mem:hibernate-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1 h2 sa diff --git a/hibernate5/src/main/webapp/WEB-INF/templates/default.xhtml b/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml similarity index 98% rename from hibernate5/src/main/webapp/WEB-INF/templates/default.xhtml rename to hibernate/src/main/webapp/WEB-INF/templates/default.xhtml index 9ee63d7a23..9428622ee4 100644 --- a/hibernate5/src/main/webapp/WEB-INF/templates/default.xhtml +++ b/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"> - hibernate5 + hibernate diff --git a/hibernate5/src/main/webapp/index.html b/hibernate/src/main/webapp/index.html similarity index 100% rename from hibernate5/src/main/webapp/index.html rename to hibernate/src/main/webapp/index.html diff --git a/hibernate5/src/main/webapp/index.xhtml b/hibernate/src/main/webapp/index.xhtml similarity index 100% rename from hibernate5/src/main/webapp/index.xhtml rename to hibernate/src/main/webapp/index.xhtml diff --git a/hibernate5/src/main/webapp/resources/css/screen.css b/hibernate/src/main/webapp/resources/css/screen.css similarity index 100% rename from hibernate5/src/main/webapp/resources/css/screen.css rename to hibernate/src/main/webapp/resources/css/screen.css diff --git a/hibernate5/src/main/webapp/resources/gfx/asidebkg.png b/hibernate/src/main/webapp/resources/gfx/asidebkg.png similarity index 100% rename from hibernate5/src/main/webapp/resources/gfx/asidebkg.png rename to hibernate/src/main/webapp/resources/gfx/asidebkg.png diff --git a/hibernate5/src/main/webapp/resources/gfx/banner.png b/hibernate/src/main/webapp/resources/gfx/banner.png similarity index 100% rename from hibernate5/src/main/webapp/resources/gfx/banner.png rename to hibernate/src/main/webapp/resources/gfx/banner.png diff --git a/hibernate5/src/main/webapp/resources/gfx/bkg-blkheader.png b/hibernate/src/main/webapp/resources/gfx/bkg-blkheader.png similarity index 100% rename from hibernate5/src/main/webapp/resources/gfx/bkg-blkheader.png rename to hibernate/src/main/webapp/resources/gfx/bkg-blkheader.png diff --git a/hibernate5/src/main/webapp/resources/gfx/headerbkg.png b/hibernate/src/main/webapp/resources/gfx/headerbkg.png similarity index 100% rename from hibernate5/src/main/webapp/resources/gfx/headerbkg.png rename to hibernate/src/main/webapp/resources/gfx/headerbkg.png diff --git a/hibernate5/src/main/webapp/resources/gfx/rhjb_eap_logo.png b/hibernate/src/main/webapp/resources/gfx/rhjb_eap_logo.png similarity index 100% rename from hibernate5/src/main/webapp/resources/gfx/rhjb_eap_logo.png rename to hibernate/src/main/webapp/resources/gfx/rhjb_eap_logo.png diff --git a/pom.xml b/pom.xml index ea1074c65b..d473eca3bc 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ helloworld-singleton helloworld-ws hibernate4 - hibernate5 + hibernate inter-app jaxrs-client jaxws-addressing