dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7937
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-08-20 16:12:03 +0700
message:
  local vn - Added missing bean and fixed hibernate mapping
modified:
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/DefaultOrganisationUnitPrototypeService.java
  local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototype.hbm.xml
  local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototypeGroup.hbm.xml
  local/vn/dhis-web-spreadsheet-reporting/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 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/DefaultOrganisationUnitPrototypeService.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/DefaultOrganisationUnitPrototypeService.java	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/DefaultOrganisationUnitPrototypeService.java	2012-08-20 09:12:03 +0000
@@ -57,7 +57,7 @@
 
     private OrganisationUnitPrototypeStore organisationUnitPrototypeStore;
 
-    public void setOrganisationUnitPrototypeTypeStore( OrganisationUnitPrototypeStore organisationUnitPrototypeStore )
+    public void setOrganisationUnitPrototypeStore( OrganisationUnitPrototypeStore organisationUnitPrototypeStore )
     {
         this.organisationUnitPrototypeStore = organisationUnitPrototypeStore;
     }

=== modified file 'local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml	2012-08-20 09:12:03 +0000
@@ -54,6 +54,13 @@
 		<property name="cacheable" value="true" />
 	</bean>
 	
+	<bean id="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeGroupStore"
+		class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
+		<property name="clazz" value="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeGroup" />
+		<property name="sessionFactory" ref="sessionFactory" />
+		<property name="cacheable" value="true" />
+	</bean>
+	
 	<bean id="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeService"
 		class="org.hisp.dhis.organisationunitprototype.DefaultOrganisationUnitPrototypeService">
 		<property name="organisationUnitPrototypeStore" ref="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeStore" />

=== modified file 'local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototype.hbm.xml'
--- local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototype.hbm.xml	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototype.hbm.xml	2012-08-20 09:12:03 +0000
@@ -6,7 +6,7 @@
 >
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.organisationunit.OrganisationUnitPrototype" table="orgunitprototype">
+  <class name="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototype" table="orgunitprototype">
 
     <id name="id" column="orgunitprototypeid">
       <generator class="native" />
@@ -18,7 +18,7 @@
 	<set name="groups" table="orgunitprototypegroupmembers" inverse="true">
       <cache usage="read-write" />
       <key column="orgunitprototypeid" />
-      <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitPrototypeGroup" column="orgunitprototypegroupid" />
+      <many-to-many class="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeGroup" column="orgunitprototypegroupid" />
     </set>
 	
   </class>

=== modified file 'local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototypeGroup.hbm.xml'
--- local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototypeGroup.hbm.xml	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/organisationunitprototype/hibernate/OrganisationUnitPrototypeGroup.hbm.xml	2012-08-20 09:12:03 +0000
@@ -6,7 +6,7 @@
 >
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.organisationunit.OrganisationUnitPrototypeGroup" table="orgunitprototypegroup">
+  <class name="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototypeGroup" table="orgunitprototypegroup">
 
     <cache usage="read-write" />
 
@@ -18,7 +18,7 @@
     <set name="members" table="orgunitprototypegroupmembers">
       <cache usage="read-write" />
       <key column="orgunitprototypegroupid" foreign-key="fk_orgunitprototypegroupmembers_orgunitprototypegroupid" />
-      <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitPrototype" column="orgunitprototypeid"
+      <many-to-many class="org.hisp.dhis.organisationunitprototype.OrganisationUnitPrototype" column="orgunitprototypeid"
         foreign-key="fk_orgunitprototypegroup_orgunitprototypeid" />
     </set>
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2012-08-20 09:12:03 +0000
@@ -1718,7 +1718,7 @@
 		<!-- OrganisationUnitPrototypeGroup -->
 
 		<action name="orgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.GetOrgUnitPrototypeGroupListAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.GetOrgUnitPrototypeGroupListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-spreadsheet-reporting/organisationUnitPrototypeGroup.vm</param>
 			<param name="menu">/dhis-web-spreadsheet-reporting/menu.vm</param>
@@ -1726,7 +1726,7 @@
 		</action>
 
 		<action name="getOrgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.GetOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.GetOrgUnitPrototypeGroupAction">
 			<result name="success" type="velocity-json">
 				/dhis-web-spreadsheet-reporting/jsonOrganisationUnitPrototypeGroup.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
@@ -1734,7 +1734,7 @@
 		</action>
 
 		<action name="getOrgUnitPrototypeGroups"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.GetOrgUnitPrototypeGroupListAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.GetOrgUnitPrototypeGroupListAction">
 			<result name="success" type="velocity-json">
 				/dhis-web-spreadsheet-reporting/jsonOrganisationUnitPrototypeGroups.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
@@ -1742,7 +1742,7 @@
 		</action>
 
 		<action name="removeOrgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.RemoveOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.RemoveOrgUnitPrototypeGroupAction">
 			<result name="success" type="velocity-json">
 				/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
 			<result name="error" type="velocity-json">
@@ -1760,13 +1760,13 @@
 		</action>
 
 		<action name="addOrgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.AddOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.AddOrgUnitPrototypeGroupAction">
 			<result name="success" type="redirect">orgUnitPrototypeGroup.action</result>
 			<param name="requiredAuthorities">F_ORGANISATIONUNITPROTOTYPEGROUP_ADD</param>
 		</action>
 
 		<action name="showUpdateOrgUnitPrototypeGroupForm"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.GetOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.GetOrgUnitPrototypeGroupAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-spreadsheet-reporting/updateOrgUnitPrototypeGroupForm.vm</param>
 			<param name="javascripts">javascript/organisationUnitPrototypeGroup.js</param>
@@ -1774,13 +1774,13 @@
 		</action>
 
 		<action name="updateOrgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.UpdateOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.UpdateOrgUnitPrototypeGroupAction">
 			<result name="success" type="redirect">orgUnitPrototypeGroup.action</result>
 			<param name="requiredAuthorities">F_ORGANISATIONUNITPROTOTYPEGROUP_UPDATE</param>
 		</action>
 
 		<action name="validateOrgUnitPrototypeGroup"
-			class="org.hisp.dhis.reportsheet.orgunitprototype.action.ValidateOrgUnitPrototypeGroupAction">
+			class="org.hisp.dhis.reportsheet.orgunitprototypegroup.action.ValidateOrgUnitPrototypeGroupAction">
 			<result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
 			<result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>