From 682f93885b1e92411aad23ba6659e935bfcf4002 Mon Sep 17 00:00:00 2001 From: amit2103 Date: Sun, 21 Oct 2018 11:48:52 +0530 Subject: [PATCH] [BAEL-9696] - Fixed conflicts and moved new code changes --- .../src/main/java/com/baeldung/hibernate/customtypes/Address.java | 0 .../main/java/com/baeldung/hibernate/customtypes/AddressType.java | 0 .../hibernate/customtypes/LocalDateStringJavaDescriptor.java | 0 .../com/baeldung/hibernate/customtypes/LocalDateStringType.java | 0 .../java/com/baeldung/hibernate/customtypes/OfficeEmployee.java | 0 .../main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java | 0 .../java/com/baeldung/hibernate/customtypes/PhoneNumberType.java | 0 .../src/main/java/com/baeldung/hibernate/customtypes/Salary.java | 0 .../baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java | 0 .../main/java/com/baeldung/hibernate/customtypes/SalaryType.java | 0 .../hibernate/customtypes/HibernateCustomTypesUnitTest.java | 0 .../src/test/resources/hibernate-customtypes.properties | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/Address.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/Salary.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java (100%) rename {hibernate5 => persistence-modules/hibernate5}/src/test/resources/hibernate-customtypes.properties (100%) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Address.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/Salary.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryCurrencyConvertor.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java similarity index 100% rename from hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java rename to persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java similarity index 100% rename from hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java rename to persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesUnitTest.java diff --git a/hibernate5/src/test/resources/hibernate-customtypes.properties b/persistence-modules/hibernate5/src/test/resources/hibernate-customtypes.properties similarity index 100% rename from hibernate5/src/test/resources/hibernate-customtypes.properties rename to persistence-modules/hibernate5/src/test/resources/hibernate-customtypes.properties