dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1238
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-12-17 10:05:15 +0100
message:
  o Moved dependencies from web root POM to dhis-web-commons pOM. This means that dhis-web-commons-resources no longer inherits any dependencies, which implies slightly shorter build time for web modules since all of them are merged with the former module. o Added available/selected header for data elements in outlier analysis.
modified:
  dhis-2/dhis-web/dhis-web-commons/pom.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm
  dhis-2/dhis-web/pom.xml
  dhis-2/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-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2009-11-23 16:16:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2009-12-17 09:05:15 +0000
@@ -83,6 +83,10 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-options</artifactId>
     </dependency>
+	<dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-i18n-upgrader</artifactId>
+    </dependency>
     
     <!-- Web -->
     
@@ -108,7 +112,7 @@
     </dependency>
     
     <!-- Other -->
-    
+	
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-12-14 17:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties	2009-12-17 09:05:15 +0000
@@ -140,4 +140,6 @@
 intro_validation_rule_group = Add, modify, view and delete validation rule groups. Provides the ability to group and run validation rules together.
 intro_run_validation = Run validation rules in order to unveil anomalies and errors in the data in the database.
 intro_outlier_analysis = Perform analysis of potential outlier values. Outlier values can be examined and checked for data capture errors.
-view_all = View all
\ No newline at end of file
+view_all = View all
+available_data_elements = Available data elements
+selected_data_elements = Selected data elements
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm	2009-11-25 15:56:24 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/outlierForm.vm	2009-12-17 09:05:15 +0000
@@ -45,8 +45,10 @@
  
  <table>    
 	## DATA ELEMENTS CHOOSER
-	<tr >
-		<th colspan="3" style="min-width:325px;">$i18n.getString( "select_data_elements" )</th>
+	<tr>
+		<th style="min-width:325px;">$i18n.getString( "available_data_elements" )</th>
+		<td></td>
+		<th style="min-width:325px;">$i18n.getString( "selected_data_elements" )</th>
 	</tr>
 	<tr>
 		<td>

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2009-11-23 16:16:42 +0000
+++ dhis-2/dhis-web/pom.xml	2009-12-17 09:05:15 +0000
@@ -21,8 +21,8 @@
     <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-excel-reporting</module>
+    <module>dhis-web-caseentry</module>
     <module>dhis-web-portal</module>	
   </modules>
   
@@ -52,46 +52,23 @@
       </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-i18n-upgrader</artifactId>
-      <version>${version}</version>
-    </dependency>
-  </dependencies>
-
+
   <dependencyManagement>
-    <dependencies>
-      <!--DHIS -->
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
+    <dependencies>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-web-commons</artifactId>
-        <version>${version}</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.hisp.dhis</groupId>
+        <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-web-commons-resources</artifactId>
-        <version>${version}</version>
-        <type>war</type>
-        <scope>runtime</scope>
-      </dependency>
-      <!--Web -->
-      <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>1.1.1</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.4</version>
-        <scope>compile</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+        <version>${version}</version>
+        <type>war</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <properties>
     <rootDir>../</rootDir>
   </properties>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2009-12-16 21:24:10 +0000
+++ dhis-2/pom.xml	2009-12-17 09:05:15 +0000
@@ -238,6 +238,11 @@
         <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-useradminandsecurity</artifactId>
         <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
+        <artifactId>dhis-i18n-upgrader</artifactId>
+        <version>${version}</version>
       </dependency>
       <!--Other -->
       <dependency>
@@ -331,6 +336,11 @@
         <version>1.7</version>
       </dependency>
       <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.2.1</version>
+      </dependency>
+      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.3</version>