dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15712
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-06-17 10:15:57 +0200
message:
  Event chart, added missing bean definitions for event chart store + service. Case entry, removed bean definition for removed class. 
modified:
  dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.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-tracker/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-06-12 18:38:24 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-06-17 08:15:57 +0000
@@ -135,6 +135,12 @@
         <property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 	
+	<bean id="org.hisp.dhis.eventchart.EventChartStore"
+		class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
+	    <property name="clazz" value="org.hisp.dhis.eventchart.EventChart" />
+        <property name="sessionFactory" ref="sessionFactory" />			
+	</bean>
+	
 	<!-- Service definitions -->
 
 	<bean id="org.hisp.dhis.program.ProgramDataEntryService" class="org.hisp.dhis.program.DefaultProgramDataEntryService">
@@ -345,13 +351,16 @@
 		<property name="sessionFactory" ref="sessionFactory" />
 		<property name="transientIdentifiableProperties" value="true" />
 	</bean>
-	
-	<!-- EventReport -->
-	
+		
 	<bean id="org.hisp.dhis.eventreport.EventReportService"
 	    class="org.hisp.dhis.eventreport.DefaultEventReportService">
 	    <property name="eventReportStore" ref="org.hisp.dhis.eventreport.EventReportStore" />    
 	</bean>
+	
+	<bean id="org.hisp.dhis.eventchart.EventChartService"
+		class="org.hisp.dhis.eventchart.DefaultEventChartService">
+		<property name="eventChartStore" ref="org.hisp.dhis.eventchart.EventChartStore" />
+	</bean>
 
 	<!-- Startup -->
 
@@ -444,8 +453,7 @@
 		<property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
 	</bean>
 
-	<bean
-		id="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler"
+	<bean id="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler"
 		class="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 	</bean>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2014-06-16 12:05:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2014-06-17 08:15:57 +0000
@@ -618,19 +618,6 @@
 	</bean>
 
 	<bean
-		id="org.hisp.dhis.caseentry.action.trackedentity.SearchRelationshipEntityInstanceAction"
-		class="org.hisp.dhis.caseentry.action.trackedentity.SearchRelationshipEntityInstanceAction"
-		scope="prototype">
-		<property name="entityInstanceService" ref="org.hisp.dhis.trackedentity.TrackedEntityInstanceService" />
-		<property name="attributeService"
-			ref="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
-		<property name="attributeValueService"
-			ref="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueService" />
-		<property name="relationshipService"
-			ref="org.hisp.dhis.relationship.RelationshipService" />
-	</bean>
-
-	<bean
 		id="org.hisp.dhis.caseentry.action.trackedentity.ShowAddRelationshipFormAction"
 		class="org.hisp.dhis.caseentry.action.trackedentity.ShowAddRelationshipFormAction"
 		scope="prototype">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2014-06-16 12:05:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2014-06-17 08:15:57 +0000
@@ -669,13 +669,6 @@
 			<param name="requiredAuthorities">F_RELATIONSHIP_ADD, F_TRACKED_ENTITY_INSTANCE_ADD</param>
 		</action>
 		
-		<action name="searchRelationshipTrackedEntityInstance"
-			class="org.hisp.dhis.caseentry.action.trackedentity.SearchRelationshipEntityInstanceAction">
-			<result name="success" type="velocity">/content.vm</result>
-			<param name="page">/dhis-web-caseentry/relationshipTrackedEntityInstances.vm</param>
-			<param name="requiredAuthorities">F_RELATIONSHIP_ADD</param>
-		</action>
-
 		<action name="saveRelationship"
 			class="org.hisp.dhis.caseentry.action.trackedentity.SaveRelationshipAction">
 			<result name="success" type="velocity-xml">