Merge pull request #8748 from kwoyke/JAVA-143

JAVA-143: Standardize packages in persistence-modules (part 3)

persistence-modules/spring-hibernate-3/README.md

@@ -4,8 +4,8 @@ This module contains articles about Spring with Hibernate 3
 
 ### Relevant Articles: 
 
-- [Hibernate 3 with Spring](http://www.baeldung.com/hibernate3-spring)
+- [Hibernate 3 with Spring](https://www.baeldung.com/hibernate3-spring)
-- [HibernateException: No Hibernate Session Bound to Thread in Hibernate 3](http://www.baeldung.com/no-hibernate-session-bound-to-thread-exception)
+- [HibernateException: No Hibernate Session Bound to Thread in Hibernate 3](https://www.baeldung.com/no-hibernate-session-bound-to-thread-exception)
 
 ### Quick Start
 

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/AbstractHibernateDao.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.io.Serializable;
 import java.util.List;

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/EventDao.java

@@ -1,7 +1,7 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.model.Event;
 import org.springframework.stereotype.Repository;
 
 @Repository

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/FooDao.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/IEventDao.java

@@ -0,0 +1,8 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.model.Event;
+
+
+public interface IEventDao extends IOperations<Event> {
+    //
+}

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/IFooDao.java

@@ -0,0 +1,7 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.model.Foo;
+
+public interface IFooDao extends IOperations<Foo> {
+    //
+}

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/dao/IOperations.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.io.Serializable;
 import java.util.List;

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/model/Event.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/model/Foo.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/service/EventService.java

@@ -1,8 +1,8 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 
-import org.baeldung.persistence.dao.IEventDao;
+import com.baeldung.persistence.model.Event;
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.dao.IEventDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/persistence/service/FooService.java

@@ -1,7 +1,7 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
-import org.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/spring/PersistenceConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.Properties;
 
@@ -22,7 +22,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-h2.properties" })
-@ComponentScan({ "org.baeldung.persistence.dao", "org.baeldung.persistence.service" })
+@ComponentScan({ "com.baeldung.persistence.dao", "com.baeldung.persistence.service" })
 public class PersistenceConfig {
 
     @Autowired
@@ -36,7 +36,7 @@ public class PersistenceConfig {
     public AnnotationSessionFactoryBean sessionFactory() {
         final AnnotationSessionFactoryBean sessionFactory = new AnnotationSessionFactoryBean();
         sessionFactory.setDataSource(dataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/spring/PersistenceConfigHibernate3.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.Properties;
 
@@ -24,7 +24,7 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-h2.properties" })
-@ComponentScan({ "org.baeldung.persistence.dao", "org.baeldung.persistence.service" })
+@ComponentScan({ "com.baeldung.persistence.dao", "com.baeldung.persistence.service" })
 public class PersistenceConfigHibernate3 {
     
     @Autowired

persistence-modules/spring-hibernate-3/src/main/java/com/baeldung/spring/PersistenceXmlConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ImportResource;
@@ -6,7 +6,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 // @Configuration
 @EnableTransactionManagement
-@ComponentScan({ "org.baeldung.persistence.dao", "org.baeldung.persistence.service" })
+@ComponentScan({ "com.baeldung.persistence.dao", "com.baeldung.persistence.service" })
 @ImportResource({ "classpath:persistenceConfig.xml" })
 public class PersistenceXmlConfig {
 

persistence-modules/spring-hibernate-3/src/main/java/org/baeldung/persistence/dao/IEventDao.java

@@ -1,9 +0,0 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.model.Event;
-
-
-
-public interface IEventDao extends IOperations<Event> {
-    //
-}

persistence-modules/spring-hibernate-3/src/main/java/org/baeldung/persistence/dao/IFooDao.java

@@ -1,7 +0,0 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.model.Foo;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}

persistence-modules/spring-hibernate-3/src/main/resources/exceptionDemo.cfg.xml

@@ -4,6 +4,6 @@
 		"http://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-       <mapping class="org.baeldung.persistence.model.Event" />
+       <mapping class="com.baeldung.persistence.model.Event" />
     </session-factory>
 </hibernate-configuration>

persistence-modules/spring-hibernate-3/src/main/resources/exceptionDemoPersistenceConfig.xml

@@ -16,7 +16,7 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
  
     <context:annotation-config />
-    <context:component-scan base-package="org.baeldung.persistence" />
+    <context:component-scan base-package="com.baeldung.persistence" />
     <context:property-placeholder location="classpath:persistence-h2.properties"/>
 
 

persistence-modules/spring-hibernate-3/src/main/resources/persistenceConfig.xml

@@ -9,7 +9,7 @@
 
     <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
         <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
+        <property name="packagesToScan" value="com.baeldung.persistence.model"/>
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>

persistence-modules/spring-hibernate-3/src/main/webapp/WEB-INF/web.xml

@@ -11,7 +11,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
+        <param-value>com.baeldung.spring</param-value>
     </context-param>
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.PersistenceConfig;
+import com.baeldung.spring.PersistenceConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java

@@ -1,10 +1,9 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.spring.PersistenceConfig;
-import org.baeldung.persistence.service.FooService;
+import com.baeldung.persistence.model.Foo;
-import org.baeldung.spring.PersistenceConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/persistence/service/HibernateExceptionScen1MainIntegrationTest.java

@@ -1,7 +1,7 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.model.Event;
-import org.baeldung.spring.PersistenceConfigHibernate3;
+import com.baeldung.spring.PersistenceConfigHibernate3;
 import org.hamcrest.core.IsInstanceOf;
 import org.hibernate.HibernateException;
 import org.junit.Ignore;

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/persistence/service/HibernateExceptionScen2MainIntegrationTest.java

@@ -1,7 +1,7 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.model.Event;
-import org.baeldung.spring.PersistenceConfig;
+import com.baeldung.spring.PersistenceConfig;
 import org.hamcrest.core.IsInstanceOf;
 import org.hibernate.HibernateException;
 import org.junit.Ignore;

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/persistence/service/NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java

@@ -1,7 +1,7 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.model.Event;
-import org.baeldung.spring.PersistenceXmlConfig;
+import com.baeldung.spring.PersistenceXmlConfig;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;

persistence-modules/spring-hibernate-3/src/test/java/com/baeldung/persistence/service/NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
-import org.baeldung.persistence.model.Event;
+import com.baeldung.persistence.model.Event;
 import org.hibernate.HibernateException;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -8,7 +8,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.hibernate3.HibernateSystemException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

persistence-modules/spring-hibernate-5/README.md

@@ -4,11 +4,11 @@ This module contains articles about Hibernate 5 with Spring.
 
 ### Relevant articles
 
-- [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
+- [Hibernate Many to Many Annotation Tutorial](https://www.baeldung.com/hibernate-many-to-many)
-- [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
+- [Programmatic Transactions in the Spring TestContext Framework](https://www.baeldung.com/spring-test-programmatic-transactions)
-- [JPA Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
+- [JPA Criteria Queries](https://www.baeldung.com/hibernate-criteria-queries)
-- [Introduction to Hibernate Search](http://www.baeldung.com/hibernate-search)
+- [Introduction to Hibernate Search](https://www.baeldung.com/hibernate-search)
 - [@DynamicUpdate with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-dynamicupdate)
-- [Hibernate Second-Level Cache](http://www.baeldung.com/hibernate-second-level-cache)
+- [Hibernate Second-Level Cache](https://www.baeldung.com/hibernate-second-level-cache)
-- [Deleting Objects with Hibernate](http://www.baeldung.com/delete-with-hibernate)
+- [Deleting Objects with Hibernate](https://www.baeldung.com/delete-with-hibernate)
-- [Spring, Hibernate and a JNDI Datasource](http://www.baeldung.com/spring-persistence-jpa-jndi-datasource)
+- [Spring, Hibernate and a JNDI Datasource](https://www.baeldung.com/spring-persistence-jpa-jndi-datasource)

persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-hibernate4/README.md

@@ -3,13 +3,13 @@
 This module contains articles about Spring with Hibernate 4
 
 ### Relevant Articles: 
-- [Guide to Hibernate 4 with Spring](http://www.baeldung.com/hibernate-4-spring)
+- [Guide to Hibernate 4 with Spring](https://www.baeldung.com/hibernate-4-spring)
-- [Hibernate Pagination](http://www.baeldung.com/hibernate-pagination)
+- [Hibernate Pagination](https://www.baeldung.com/hibernate-pagination)
-- [Sorting with Hibernate](http://www.baeldung.com/hibernate-sort)
+- [Sorting with Hibernate](https://www.baeldung.com/hibernate-sort)
-- [Stored Procedures with Hibernate](http://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
+- [Stored Procedures with Hibernate](https://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
-- [Hibernate: save, persist, update, merge, saveOrUpdate](http://www.baeldung.com/hibernate-save-persist-update-merge-saveorupdate)
+- [Hibernate: save, persist, update, merge, saveOrUpdate](https://www.baeldung.com/hibernate-save-persist-update-merge-saveorupdate)
-- [Eager/Lazy Loading In Hibernate](http://www.baeldung.com/hibernate-lazy-eager-loading)
+- [Eager/Lazy Loading In Hibernate](https://www.baeldung.com/hibernate-lazy-eager-loading)
-- [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
+- [The DAO with Spring and Hibernate](https://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [Auditing with JPA, Hibernate, and Spring Data JPA](https://www.baeldung.com/database-auditing-jpa)
 
 ### Quick Start

persistence-modules/spring-hibernate4/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;