=== modified file 'dhis-2/dhis-services/dhis-service-i18n/pom.xml'
--- dhis-2/dhis-services/dhis-service-i18n/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/pom.xml	2011-02-03 10:36:33 +0000
@@ -23,10 +23,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
 	
   </dependencies>
   <properties>

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/pom.xml'
--- dhis-2/dhis-services/dhis-service-importexport/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/pom.xml	2011-02-03 10:36:33 +0000
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-xml</artifactId>
+      <artifactId>dhis-support-xml</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-services/pom.xml	2011-02-03 10:36:33 +0000
@@ -15,7 +15,6 @@
   
   <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>

=== renamed directory 'dhis-2/dhis-services/dhis-service-xml' => 'dhis-2/dhis-support/dhis-support-xml'
=== modified file 'dhis-2/dhis-support/dhis-support-xml/pom.xml'
--- dhis-2/dhis-services/dhis-service-xml/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-support/dhis-support-xml/pom.xml	2011-02-03 10:36:33 +0000
@@ -5,16 +5,23 @@
 
   <parent>
     <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis-services</artifactId>
+    <artifactId>dhis-support</artifactId>
     <version>2.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dhis-service-xml</artifactId>
+  <artifactId>dhis-support-xml</artifactId>
   <packaging>jar</packaging>
   <name>DHIS XML framework services</name>
 
   <dependencies>
 
+    <!-- DHIS -->
+
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-test</artifactId>
+    </dependency>
+
     <!-- Other -->
 
     <dependency>

=== modified file 'dhis-2/dhis-support/pom.xml'
--- dhis-2/dhis-support/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-support/pom.xml	2011-02-03 10:36:33 +0000
@@ -20,6 +20,7 @@
     <module>dhis-support-external</module>
     <module>dhis-support-jdbc</module>
     <module>dhis-support-jdbc-test</module>
+    <module>dhis-support-xml</module>
   </modules>
   <properties>
     <rootDir>../</rootDir>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml	2011-02-03 10:36:33 +0000
@@ -32,10 +32,6 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-reporting</artifactId>
     </dependency>
     <dependency>
@@ -46,6 +42,10 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-datamart-default</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-xml</artifactId>
+    </dependency>
         
     <!-- Other -->
     

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-01-23 00:12:53 +0000
+++ dhis-2/pom.xml	2011-02-03 10:36:33 +0000
@@ -185,11 +185,6 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
-        <artifactId>dhis-service-xml</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-service-importexport</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -236,6 +231,11 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
+        <artifactId>dhis-support-xml</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-support-test</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>