=== removed directory 'dhis-2/dhis-i18n'
=== removed file 'dhis-2/dhis-i18n/pom.xml'
--- dhis-2/dhis-i18n/pom.xml	2010-04-22 12:58:24 +0000
+++ dhis-2/dhis-i18n/pom.xml	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-i18n</artifactId>
-  <packaging>pom</packaging>
-  <name>DHIS I18n Parent Project</name>
-  
-  <modules>
-    <module>dhis-i18n-static</module>
-    <module>dhis-i18n-db</module>
-  </modules>
-  
-  <dependencies>
-    
-    <!-- DHIS -->
-    
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-test</artifactId>
-    </dependency>
-  </dependencies>
-  <properties>
-    <rootDir>../</rootDir>
-  </properties>
-</project>

=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
--- dhis-2/dhis-services/dhis-service-core/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/pom.xml	2010-04-22 14:06:28 +0000
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-db</artifactId>
+      <artifactId>dhis-support-i18n</artifactId>
     </dependency>
 
     <!-- Spring Security -->

=== renamed directory 'dhis-2/dhis-i18n/dhis-i18n-static' => 'dhis-2/dhis-services/dhis-service-i18n'
=== modified file 'dhis-2/dhis-services/dhis-service-i18n/pom.xml'
--- dhis-2/dhis-i18n/dhis-i18n-static/pom.xml	2010-04-22 12:58:24 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/pom.xml	2010-04-22 14:06:28 +0000
@@ -5,11 +5,11 @@
   
   <parent>
     <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-i18n</artifactId>
+    <artifactId>dhis-services</artifactId>
     <version>2.0.5-SNAPSHOT</version>
   </parent>
   
-  <artifactId>dhis-i18n-static</artifactId>
+  <artifactId>dhis-service-i18n</artifactId>
   <packaging>jar</packaging>
   <name>DHIS I18n Static</name>
   

=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/pom.xml	2010-04-22 14:06:28 +0000
@@ -15,10 +15,11 @@
   
   <modules>
     <module>dhis-service-core</module>
+    <module>dhis-service-xml</module>
+    <module>dhis-service-i18n</module>
     <module>dhis-service-options</module>
     <module>dhis-service-administration</module>
     <module>dhis-service-datamart-default</module>
-    <module>dhis-service-xml</module>
     <module>dhis-service-importexport</module>
     <module>dhis-service-reporting</module>
     <module>dhis-service-excel-reporting</module>

=== renamed directory 'dhis-2/dhis-i18n/dhis-i18n-db' => 'dhis-2/dhis-support/dhis-support-i18n'
=== modified file 'dhis-2/dhis-support/dhis-support-i18n/pom.xml'
--- dhis-2/dhis-i18n/dhis-i18n-db/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-support/dhis-support-i18n/pom.xml	2010-04-22 14:06:28 +0000
@@ -5,11 +5,11 @@
 
   <parent>
     <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-i18n</artifactId>
+    <artifactId>dhis-support</artifactId>
     <version>2.0.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dhis-i18n-db</artifactId>
+  <artifactId>dhis-support-i18n</artifactId>
   <packaging>jar</packaging>
   <name>DHIS I18n DB</name>
 
@@ -25,6 +25,10 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-test</artifactId>
+    </dependency>
     
     <!-- Other -->
     

=== modified file 'dhis-2/dhis-support/pom.xml'
--- dhis-2/dhis-support/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-support/pom.xml	2010-04-22 14:06:28 +0000
@@ -20,6 +20,7 @@
     <module>dhis-support-external</module>
     <module>dhis-support-jdbc</module>
     <module>dhis-support-jdbc-test</module>
+    <module>dhis-support-i18n</module>
   </modules>
   <properties>
     <rootDir>../</rootDir>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-04-22 12:58:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-04-22 14:06:28 +0000
@@ -52,11 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-static</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-db</artifactId>
+      <artifactId>dhis-service-i18n</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2010-04-22 12:58:24 +0000
+++ dhis-2/pom.xml	2010-04-22 14:06:28 +0000
@@ -21,7 +21,6 @@
 
   <modules>
     <module>dhis-api</module>
-    <module>dhis-i18n</module>
     <module>dhis-services</module>
     <module>dhis-support</module>
   </modules>
@@ -135,12 +134,7 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
-        <artifactId>dhis-i18n-static</artifactId>
-        <version>${version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
-        <artifactId>dhis-i18n-db</artifactId>
+        <artifactId>dhis-service-i18n</artifactId>
         <version>${version}</version>
       </dependency>
       <dependency>
@@ -221,6 +215,11 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
+        <artifactId>dhis-support-i18n</artifactId>
+        <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-support-test</artifactId>
         <version>${version}</version>
         <scope>test</scope>