dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1934
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-18 13:10:57 +0200
message:
  Removed unnecessary file. Fix to dataentry beans.xml
removed:
  local/in/dhis-web-reports-national/java.exe.stackdump
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/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-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2010-08-18 10:48:12 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2010-08-18 11:10:57 +0000
@@ -139,20 +139,16 @@
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
 		<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 	</bean>
 
-	<bean id="org.hisp.dhis.de.action.multidimensional.SaveValueAction"
-		class="org.hisp.dhis.de.action.multidimensional.SaveValueAction"
+	<bean id="org.hisp.dhis.de.action.multidimensional.SaveValueAction"	class="org.hisp.dhis.de.action.multidimensional.SaveValueAction"
 		scope="prototype">
 		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
 		<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
 		<property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
-		<property name="categoryService"
-			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
-		<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+		<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.de.action.SaveCommentAction" class="org.hisp.dhis.de.action.SaveCommentAction"

=== removed file 'local/in/dhis-web-reports-national/java.exe.stackdump'
--- local/in/dhis-web-reports-national/java.exe.stackdump	2010-07-19 08:20:14 +0000
+++ local/in/dhis-web-reports-national/java.exe.stackdump	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Exception: STATUS_ACCESS_VIOLATION at eip=610C17E9
-eax=00000000 ebx=00000001 ecx=00000000 edx=00000674 esi=00000000 edi=18EDCCC8
-ebp=18EDCB04 esp=18EDCADC program=C:\Program Files\Java\jdk1.6.0_17\bin\java.exe, pid 2720, thread unknown (0x384)
-cs=001B ds=0023 es=0023 fs=003B gs=0000 ss=0023
-Stack trace:
-Frame     Function  Args
-18EDCB04  610C17E9  (00000000, 00000000, 00000000, 00000000)
-18EDCC14  610C2185  (00000000, 00000000, 00000000, 00000000)
-18EDCCD4  610C2F6A  (FFFFFFFF, FFFFFFFF, 00000000, 00000000)
-18EDCD24  61027DB2  (00000002, 18EDCE64, 00000002, 18EDCDF4)
-18EDCDB8  7C87655C  (00000002, 18EDCDF4, 7C8763C0, 00000002)
-End of stack trace

=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml	2010-06-23 10:34:50 +0000
+++ local/in/dhis-web-reports-national/pom.xml	2010-08-18 11:10:57 +0000
@@ -104,12 +104,11 @@
     <dependency>
       <groupId>jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
-	  <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>poi</groupId>
       <artifactId>poi</artifactId>
-	  <version>2.5.1</version>
+      <version>2.5.1</version>
     </dependency>
     <dependency>
       <groupId>jfree</groupId>
@@ -118,7 +117,7 @@
     <dependency>
       <groupId>eclipse</groupId>
       <artifactId>jdtcore</artifactId>
-	  <version>3.1.0</version>
+      <version>3.1.0</version>
     </dependency>
 	<dependency>
         <groupId>com.lowagie</groupId>