dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 724
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-09-15 14:37:50 +0200
message:
  Commented excel-reporting out from portal until we resolve dependency issues.
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java
  dhis-2/dhis-web/dhis-web-portal/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java	2009-09-15 03:50:33 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datalock/hibernate/HibernateDataSetLockStore.java	2009-09-15 12:37:50 +0000
@@ -29,7 +29,6 @@
 import java.util.Collection;
 
 import org.hibernate.Criteria;
-import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Restrictions;

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-09-15 06:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-09-15 12:37:50 +0000
@@ -116,14 +116,15 @@
       <version>${version}</version>
       <type>war</type>
     </dependency>
-	
+	<!--
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-excel-reporting</artifactId>
       <version>${version}</version>
       <type>war</type>
     </dependency>
-        
+    -->
+    
     <!-- India modules -->
     
     <!--
@@ -162,15 +163,7 @@
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    -->    
-    <!--
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-vn-report</artifactId>
-      <version>${version}</version>
-      <type>war</type>
-    </dependency>
-    -->
+    --> 
     
     <!-- South Africa modules -->