[ISSUE 410] Updated spring package to be com.github.dozermapper.spring (

#450) * Updated spring package to be com.github.dozermapper.spring * Added migration docs note
DozerMapper · Jul 6, 2017 · 026fde8 · 026fde8
1 parent 77ee866
commit 026fde8
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 36 deletions.
diff --git a/docs/asciidoc/migration/v6-to-v61.adoc b/docs/asciidoc/migration/v6-to-v61.adoc
@@ -121,5 +121,18 @@ org.dozer
 com.github.dozermapper.protobuf
 ----
 
+=== 9. Updated dozer-spring package name
+**From:**
+[source,java,prettyprint]
+----
+org.dozer.spring
+----
+
+**To:**
+[source,java,prettyprint]
+----
+com.github.dozermapper.spring
+----
+
 
 
diff --git a/proto/pom.xml b/proto/pom.xml
@@ -30,7 +30,7 @@
 
     <artifactId>dozer-proto</artifactId>
     <packaging>jar</packaging>
-    <name>Dozer :: Protobuf</name>
+    <name>Dozer :: Protobuf 3</name>
 
     <properties>
         <!-- NOTE: Needs to be removed in future -->

diff --git a/...er/spring/DozerBeanMapperFactoryBean.java → ...er/spring/DozerBeanMapperFactoryBean.java b/...er/spring/DozerBeanMapperFactoryBean.java → ...er/spring/DozerBeanMapperFactoryBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring;
+package com.github.dozermapper.spring;
 
 import java.io.IOException;
 import java.net.URL;

diff --git a/...g/dozer/spring/DozerNamespaceHandler.java → ...rmapper/spring/DozerNamespaceHandler.java b/...g/dozer/spring/DozerNamespaceHandler.java → ...rmapper/spring/DozerNamespaceHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring;
+package com.github.dozermapper.spring;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 

diff --git a/.../dozer/spring/MapperDefinitionParser.java → ...mapper/spring/MapperDefinitionParser.java b/.../dozer/spring/MapperDefinitionParser.java → ...mapper/spring/MapperDefinitionParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring;
+package com.github.dozermapper.spring;
 
 import org.w3c.dom.Element;
 

diff --git a/spring/src/main/resources/META-INF/spring.handlers b/spring/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://dozermapper.github.io/schema/dozer-spring=org.dozer.spring.DozerNamespaceHandler
+http\://dozermapper.github.io/schema/dozer-spring=com.github.dozermapper.spring.DozerNamespaceHandler
diff --git a/...pring/DozerBeanMapperFactoryBeanTest.java → ...pring/DozerBeanMapperFactoryBeanTest.java b/...pring/DozerBeanMapperFactoryBeanTest.java → ...pring/DozerBeanMapperFactoryBeanTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring;
+package com.github.dozermapper.spring;
 
 import java.net.URL;
 import java.util.Collections;

diff --git a/...pring/functional_tests/NamespaceTest.java → ...pring/functional_tests/NamespaceTest.java b/...pring/functional_tests/NamespaceTest.java → ...pring/functional_tests/NamespaceTest.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests;
+package com.github.dozermapper.spring.functional_tests;
+
+import com.github.dozermapper.spring.functional_tests.support.ReferencingBean;
 
 import org.dozer.DozerBeanMapper;
 import org.dozer.Mapper;
-import org.dozer.spring.functional_tests.support.ReferencingBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...nctional_tests/SpringIntegrationTest.java → ...nctional_tests/SpringIntegrationTest.java b/...nctional_tests/SpringIntegrationTest.java → ...nctional_tests/SpringIntegrationTest.java
@@ -13,18 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests;
+package com.github.dozermapper.spring.functional_tests;
 
 import java.util.List;
 
+import com.github.dozermapper.spring.functional_tests.support.EventTestListener;
+import com.github.dozermapper.spring.functional_tests.support.InjectedCustomConverter;
+import com.github.dozermapper.spring.vo.Destination;
+import com.github.dozermapper.spring.vo.Source;
+
 import org.dozer.CustomConverter;
 import org.dozer.DozerBeanMapper;
 import org.dozer.DozerEventListener;
 import org.dozer.Mapper;
-import org.dozer.spring.functional_tests.support.EventTestListener;
-import org.dozer.spring.functional_tests.support.InjectedCustomConverter;
-import org.dozer.spring.vo.Destination;
-import org.dozer.spring.vo.Source;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

diff --git a/...upport/CustomConverterParamConverter.java → ...upport/CustomConverterParamConverter.java b/...upport/CustomConverterParamConverter.java → ...upport/CustomConverterParamConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
 
 import org.dozer.ConfigurableCustomConverter;
 

diff --git a/...onal_tests/support/EventTestListener.java → ...onal_tests/support/EventTestListener.java b/...onal_tests/support/EventTestListener.java → ...onal_tests/support/EventTestListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/...ests/support/InjectedCustomConverter.java → ...ests/support/InjectedCustomConverter.java b/...ests/support/InjectedCustomConverter.java → ...ests/support/InjectedCustomConverter.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
+
+import com.github.dozermapper.spring.vo.Destination;
+import com.github.dozermapper.spring.vo.Source;
 
 import org.dozer.DozerConverter;
-import org.dozer.spring.vo.Destination;
-import org.dozer.spring.vo.Source;
 
 /**
  * @author garsombke.franz

diff --git a/...tional_tests/support/ReferencingBean.java → ...tional_tests/support/ReferencingBean.java b/...tional_tests/support/ReferencingBean.java → ...tional_tests/support/ReferencingBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
 
 import org.dozer.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...sts/support/SampleBeanMappingBuilder.java → ...sts/support/SampleBeanMappingBuilder.java b/...sts/support/SampleBeanMappingBuilder.java → ...sts/support/SampleBeanMappingBuilder.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
+
+import com.github.dozermapper.spring.vo.Destination;
+import com.github.dozermapper.spring.vo.Source;
 
 import org.dozer.loader.api.BeanMappingBuilder;
-import org.dozer.spring.vo.Destination;
-import org.dozer.spring.vo.Source;
 
 import static org.dozer.loader.api.FieldsMappingOptions.copyByReference;
 

diff --git a/...ests/support/SampleCustomBeanFactory.java → ...ests/support/SampleCustomBeanFactory.java b/...ests/support/SampleCustomBeanFactory.java → ...ests/support/SampleCustomBeanFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.functional_tests.support;
+package com.github.dozermapper.spring.functional_tests.support;
 
 import org.dozer.BeanFactory;
 import org.dozer.config.BeanContainer;

diff --git a/...java/org/dozer/spring/vo/Destination.java → ...ub/dozermapper/spring/vo/Destination.java b/...java/org/dozer/spring/vo/Destination.java → ...ub/dozermapper/spring/vo/Destination.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.vo;
+package com.github.dozermapper.spring.vo;
 
 /**
  * @author Dmitry Buzdin

diff --git a/...test/java/org/dozer/spring/vo/Source.java → .../github/dozermapper/spring/vo/Source.java b/...test/java/org/dozer/spring/vo/Source.java → .../github/dozermapper/spring/vo/Source.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.dozer.spring.vo;
+package com.github.dozermapper.spring.vo;
 
 /**
  * @author Dmitry Buzdin

diff --git a/spring/src/test/resources/applicationContext.xml b/spring/src/test/resources/applicationContext.xml
@@ -29,7 +29,7 @@
           factory-method="buildDefault"/>
 
     <!-- Provided Spring Integration -->
-    <bean id="byFactory" class="org.dozer.spring.DozerBeanMapperFactoryBean">
+    <bean id="byFactory" class="com.github.dozermapper.spring.DozerBeanMapperFactoryBean">
         <property name="mappingFiles" value="classpath*:/*Mapping.xml"/>
         <property name="customConverters">
             <list/>

diff --git a/spring/src/test/resources/mappings/mappingSpring.xml b/spring/src/test/resources/mappings/mappingSpring.xml
@@ -24,9 +24,9 @@
         <stop-on-errors>true</stop-on-errors>
         <wildcard>true</wildcard>
         <custom-converters>
-            <converter type="org.dozer.spring.functional_tests.support.InjectedCustomConverter">
-                <class-a>org.dozer.spring.vo.Source</class-a>
-                <class-b>org.dozer.spring.vo.Destination</class-b>
+            <converter type="com.github.dozermapper.spring.functional_tests.support.InjectedCustomConverter">
+                <class-a>com.github.dozermapper.spring.vo.Source</class-a>
+                <class-b>com.github.dozermapper.spring.vo.Destination</class-b>
             </converter>
         </custom-converters>
     </configuration>

diff --git a/spring/src/test/resources/spring-bean-factory.xml b/spring/src/test/resources/spring-bean-factory.xml
@@ -31,12 +31,12 @@
         <property name="factories">
             <map>
                 <!-- the key matches the name of the factory in the dozerBeanMapping.xml file -->
-                <entry key="org.dozer.spring.functional_tests.support.SampleCustomBeanFactory" value-ref="customBeanFactory"/>
+                <entry key="com.github.dozermapper.spring.functional_tests.support.SampleCustomBeanFactory" value-ref="customBeanFactory"/>
                 <!-- more factories can be supplied with additional entry's -->
             </map>
         </property>
     </bean>
 
-    <bean id="customBeanFactory" class="org.dozer.spring.functional_tests.support.SampleCustomBeanFactory" scope="singleton"/>
+    <bean id="customBeanFactory" class="com.github.dozermapper.spring.functional_tests.support.SampleCustomBeanFactory" scope="singleton"/>
 
 </beans>
diff --git a/spring/src/test/resources/spring-bean-mapping-builder.xml b/spring/src/test/resources/spring-bean-mapping-builder.xml
@@ -19,10 +19,10 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
         "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
-    <bean id="factoryWithMappingBuilder" class="org.dozer.spring.DozerBeanMapperFactoryBean">
+    <bean id="factoryWithMappingBuilder" class="com.github.dozermapper.spring.DozerBeanMapperFactoryBean">
         <property name="mappingBuilders">
             <list>
-                <bean class="org.dozer.spring.functional_tests.support.SampleBeanMappingBuilder"/>
+                <bean class="com.github.dozermapper.spring.functional_tests.support.SampleBeanMappingBuilder"/>
             </list>
         </property>
     </bean>

diff --git a/spring/src/test/resources/spring-custom-converter.xml b/spring/src/test/resources/spring-custom-converter.xml
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="converter" class="org.dozer.spring.functional_tests.support.InjectedCustomConverter">
+    <bean id="converter" class="com.github.dozermapper.spring.functional_tests.support.InjectedCustomConverter">
         <property name="parameter" value="injectedName"/>
     </bean>
 

diff --git a/spring/src/test/resources/spring-event-listener.xml b/spring/src/test/resources/spring-event-listener.xml
@@ -30,6 +30,6 @@
         </property>
     </bean>
 
-    <bean id="eventTestListener" class="org.dozer.spring.functional_tests.support.EventTestListener" scope="singleton"/>
+    <bean id="eventTestListener" class="com.github.dozermapper.spring.functional_tests.support.EventTestListener" scope="singleton"/>
 
 </beans>
diff --git a/spring/src/test/resources/springNameSpace.xml b/spring/src/test/resources/springNameSpace.xml
@@ -25,7 +25,7 @@
 
     <dozer:mapper id="beanMapper"/>
 
-    <bean class="org.dozer.spring.functional_tests.support.ReferencingBean"/>
+    <bean class="com.github.dozermapper.spring.functional_tests.support.ReferencingBean"/>
 
 </beans>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		http\://dozermapper.github.io/schema/dozer-spring=org.dozer.spring.DozerNamespaceHandler
		http\://dozermapper.github.io/schema/dozer-spring=com.github.dozermapper.spring.DozerNamespaceHandler