=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2010-10-22 04:53:09 +0000
+++ dhis-2/dhis-services/pom.xml	2011-01-17 16:26:18 +0000
@@ -22,11 +22,9 @@
     <module>dhis-service-datamart-default</module>
     <module>dhis-service-importexport</module>
     <module>dhis-service-reporting</module>
-    <module>dhis-service-excel-reporting</module>
     <module>dhis-service-mapping</module>
     <module>dhis-service-aggregationengine-default</module>
     <module>dhis-service-patient</module>
-    <!--<module>dhis-service-mobile-model</module>-->
   </modules>
   
   <dependencies>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java	2011-01-17 06:28:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java	2011-01-17 16:26:18 +0000
@@ -30,11 +30,9 @@
 import static org.hisp.dhis.i18n.I18nUtils.i18n;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2010-11-25 22:27:18 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2011-01-17 16:26:18 +0000
@@ -119,13 +119,7 @@
       <artifactId>dhis-web-mapping</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-    </dependency>	
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-excel-reporting</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>	
+    </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-caseentry</artifactId>

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2010-10-25 07:05:55 +0000
+++ dhis-2/dhis-web/pom.xml	2011-01-17 16:26:18 +0000
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis</artifactId>
+    <artifactId>dhis</artifactId>
     <version>2.0.6-SNAPSHOT</version>
   </parent>
   <artifactId>dhis-web</artifactId>
@@ -22,7 +22,6 @@
     <module>dhis-web-reporting</module>
     <module>dhis-web-mapping</module>
     <module>dhis-web-dashboard-integration</module>
-    <module>dhis-web-excel-reporting</module>
     <module>dhis-web-caseentry</module>
     <module>dhis-web-api</module>
     <module>dhis-web-portal</module>
@@ -54,24 +53,24 @@
         </configuration>
       </plugin>
     </plugins>
-  </build>
-
+  </build>
+
   <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
+    <dependencies>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-web-commons</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-web-commons-resources</artifactId>
-        <version>${project.version}</version>
-        <type>war</type>
-      </dependency>
-    </dependencies>
+        <version>${project.version}</version>
+        <type>war</type>
+      </dependency>
+    </dependencies>
   </dependencyManagement>
-  <properties>
-    <rootDir>../</rootDir>
-  </properties>
+  <properties>
+    <rootDir>../</rootDir>
+  </properties>
 </project>

=== renamed directory 'dhis-2/dhis-services/dhis-service-excel-reporting' => 'local/vn/dhis-service-excel-reporting'
=== renamed directory 'dhis-2/dhis-web/dhis-web-excel-reporting' => 'local/vn/dhis-web-excel-reporting'