=== modified file 'local/in/dhis-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-api/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-api</artifactId>

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java	2010-06-07 06:41:39 +0000
@@ -31,10 +31,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.hisp.dhis.common.MetaObject;
+import org.hisp.dhis.common.IdentifiableObject;
 
 @SuppressWarnings("serial")
-public class LineListElement implements Serializable, MetaObject
+public class LineListElement
+    extends IdentifiableObject
+    implements Serializable
 {
     public static final String TYPE_STRING = "string";
 

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java	2010-06-07 06:41:39 +0000
@@ -2,7 +2,7 @@
 
 
 import java.io.Serializable;
-import org.hisp.dhis.common.MetaObject;
+import org.hisp.dhis.common.IdentifiableObject;
 
 /*
  * Copyright (c) 2004-2009, University of Oslo
@@ -31,7 +31,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-public class LineListElementOptions implements Serializable, MetaObject
+public class LineListElementOptions
+    extends IdentifiableObject
+    implements Serializable
 {
 
     public int getId()

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java	2010-06-07 06:41:39 +0000
@@ -29,10 +29,12 @@
 
 import java.io.Serializable;
 
-import org.hisp.dhis.common.MetaObject;
+import org.hisp.dhis.common.IdentifiableObject;
 
 @SuppressWarnings("serial")
-public class LineListOption implements Serializable, MetaObject
+public class LineListOption 
+    extends IdentifiableObject
+    implements Serializable
 {
     /**
      * The unique identifier for this LineListing Option

=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMappingService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMappingService.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMappingService.java	2010-06-07 06:41:39 +0000
@@ -33,7 +33,7 @@
 
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.Operand;
+import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListGroup;
 import org.hisp.dhis.linelisting.LineListOption;
@@ -129,7 +129,7 @@
      * @param expression The expression string.
      * @return A Set of Operands.
      */
-    Set<Operand> getOperandsInDataElementExpression( String dataElementExpression );
+    Set<DataElementOperand> getOperandsInDataElementExpression( String dataElementExpression );
     
     /**
      * Returns all operands included in an expression string. The operand is on

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-configuration</artifactId>
@@ -28,18 +28,10 @@
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
     

=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-dbmanager</artifactId>
@@ -23,7 +23,7 @@
     </dependency>
      <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-in-api</artifactId>
+      <artifactId>dhis-in-api</artifactId>
       <version>2.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
@@ -33,27 +33,15 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-  	<dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>          
+    </dependency>    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-db</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-options</artifactId>
+      <artifactId>dhis-service-options</artifactId>
     </dependency>  
 
    <dependency>

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-linelisting</artifactId>
   <packaging>jar</packaging>
-  <name>DHIS Linelisting</name>
+  <name>DHIS India Linelisting Service</name>
     
   <dependencies>
     
@@ -33,29 +33,15 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-hibernate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-  	<dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>          
+    </dependency>      
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-db</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-options</artifactId>
+      <artifactId>dhis-service-options</artifactId>
     </dependency>  
-
    <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
       <artifactId>jxl</artifactId>

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
 
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.Operand;
+import org.hisp.dhis.dataelement.DataElementOperand;
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.linelisting.LineListElement;
 import org.hisp.dhis.linelisting.LineListGroup;
@@ -135,7 +135,7 @@
         return null;
     }
 
-    public Set<Operand> getOperandsInDataElementExpression( String arg0 )
+    public Set<DataElementOperand> getOperandsInDataElementExpression( String arg0 )
     {
         // TODO Auto-generated method stub
         return null;

=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-reports</artifactId>
@@ -28,18 +28,10 @@
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
       <version>${version}</version>
     </dependency>   

=== modified file 'local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-scheduler</artifactId>
@@ -28,18 +28,10 @@
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
     

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-in-services</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-service-survey</artifactId>
@@ -28,18 +28,10 @@
     </dependency>	
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
     

=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-in-services</artifactId>

=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-dashboard</artifactId>
@@ -31,11 +31,6 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons</artifactId>
     </dependency>
     <dependency>
@@ -77,7 +72,7 @@
 	     
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-dataentry-national</artifactId>
@@ -39,11 +39,6 @@
     </dependency>    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons</artifactId>
     </dependency>
     <dependency>
@@ -64,7 +59,7 @@
     
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-excelimport</artifactId>
@@ -34,15 +34,7 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-in-service-configuration</artifactId>
       <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-  	<dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>          
+    </dependency>       
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons</artifactId>
@@ -85,7 +77,7 @@
     
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>

=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-reports-national</artifactId>
@@ -39,10 +39,6 @@
       <artifactId>dhis-in-service-configuration</artifactId>
       <version>${version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
   	<!--<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-organisationunit</artifactId>
@@ -66,7 +62,7 @@
     </dependency>	
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-user-hibernate</artifactId>
+      <artifactId>dhis-service-core</artifactId>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -125,7 +121,7 @@
     
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml	2010-06-07 06:41:39 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
   </parent>
   
   <artifactId>dhis-web-validationrule-in</artifactId>
@@ -31,14 +31,6 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-organisationunit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>
     </dependency>
     <dependency>
@@ -77,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>

=== modified file 'local/vn/dhis-web-gis/pom.xml'
--- local/vn/dhis-web-gis/pom.xml	2010-04-12 10:13:41 +0000
+++ local/vn/dhis-web-gis/pom.xml	2010-06-07 06:41:39 +0000
@@ -38,10 +38,6 @@
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-service-datamart-default</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.hisp.dhis</groupId>
-            <artifactId>dhis-service-jdbc</artifactId>
-        </dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-service-aggregationengine-default</artifactId>