=== modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml'
--- dhis-2/dhis-services/dhis-service-patient/pom.xml	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-services/dhis-service-patient/pom.xml	2009-09-23 21:10:32 +0000
@@ -41,8 +41,8 @@
 		<!-- Other -->
 
 		<dependency>
-		  <groupId>jep</groupId>
-		  <artifactId>jep</artifactId>
+		  <groupId>commons-logging</groupId>
+		  <artifactId>commons-logging</artifactId>
 		</dependency>
 		<dependency>
 	      <groupId>commons-collections</groupId>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/household/hibernate/HouseHold.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/household/hibernate/HouseHold.hbm.xml	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/household/hibernate/HouseHold.hbm.xml	2009-09-23 21:10:32 +0000
@@ -23,11 +23,10 @@
 			foreign-key="fk_household_organisationunitid"/>
 		
 		<!-- bi-directional one-to-many association to Patient -->
-		
-		<set name="members" inverse="true" cascade="all-delete-orphan" table="patient">
-			<key not-null="true" column="householdid"/>
-			<one-to-many class="org.hisp.dhis.patient.Patient"/>
-		</set>
+        <set name="members" table="household_members">
+            <key column="householdid"/>
+            <many-to-many class="org.hisp.dhis.patient.Patient" column="patientid" unique="true"/>
+        </set>
 		
 	</class>
 </hibernate-mapping>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/output.log'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/output.log	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/output.log	1970-01-01 00:00:00 +0000
@@ -1,254 +0,0 @@
-[INFO] Scanning for projects...
-[INFO] Searching repository for plugin with prefix: 'jetty'.
-[INFO] ------------------------------------------------------------------------
-[INFO] Building DHIS Patient Management
-[INFO]    task-segment: [clean, jetty:run-war]
-[INFO] ------------------------------------------------------------------------
-[INFO] [clean:clean]
-[INFO] Deleting directory C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target
-[INFO] Preparing jetty:run-war
-[INFO] [resources:resources]
-[INFO] Using encoding: 'UTF-8' to copy filtered resources.
-[INFO] [compiler:compile]
-[INFO] Compiling 20 source files to C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\classes
-[INFO] [resources:testResources]
-[INFO] Using encoding: 'UTF-8' to copy filtered resources.
-[INFO] [compiler:testCompile]
-[INFO] No sources to compile
-[INFO] [surefire:test]
-[INFO] No tests to run.
-[INFO] [war:war]
-[INFO] Exploding webapp...
-[INFO] Assembling webapp dhis-web-maintenance-patient in C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\dhis-web-maintenance-patient
-[INFO] Copy webapp webResources to C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\dhis-web-maintenance-patient
-[INFO] Building jar: C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\dhis-web-maintenance-patient\WEB-INF\lib\dhis-web-maintenance-patient.jar
-[INFO] Expanding: C:\Documents and Settings\abyotag_adm\.m2\repository\org\hisp\dhis\dhis-web-commons-resources\2.0.3-SNAPSHOT\dhis-web-commons-resources-2.0.3-SNAPSHOT.war into C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\war\work\dhis-web-commons-resources-2.0.3-SNAPSHOT
-[INFO] Overlaying 1 war(s).
-[INFO] Generating war C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\dhis-web-maintenance-patient.war
-[INFO] Building war: C:\Coding\DHIS-Patient\dhis-patient\dhis-2\dhis-web\dhis-web-maintenance\dhis-web-maintenance-patient\target\dhis-web-maintenance-patient.war
-[INFO] [jetty:run-war]
-[INFO] Configuring Jetty for project: DHIS Patient Management
-[INFO] Context path = /
-[INFO] Tmp directory =  determined at runtime
-[INFO] Web defaults = org/mortbay/jetty/webapp/webdefault.xml
-[INFO] Web overrides =  none
-[INFO] Starting jetty 6.1.16 ...
-* INFO  00:23:18,125 System property dhis2.home not set (DefaultLocationManager.java [main])
-* INFO  00:23:18,125 Environment variable DHIS2_HOME points to C:\Documents and Settings\abyotag_adm\dhis (DefaultLocationManager.java [main])
-* ERROR 00:23:18,687 Context initialization failed (ContextLoader.java [main])
-org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.i18n.hibernate.HibernateI18nPostLoadEventListener' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.i18n.I18nService' while setting bean property 'i18nService'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.i18n.I18nService' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.translation.TranslationService' while setting bean property 'translationService'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationService' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.translation.TranslationStore' while setting bean property 'translationStore'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationStore' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'sessionFactory' while setting bean property 'sessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sessionFactory' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'dataSource' while setting bean property 'dataSource'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:429)
-	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:728)
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:380)
-	at org.springframework.web.context.ContextLoader.createWebApplicationContext(ContextLoader.java:255)
-	at org.springframework.web.context.ContextLoader.initWebApplicationContext(ContextLoader.java:199)
-	at org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListener.java:45)
-	at org.mortbay.jetty.handler.ContextHandler.startContext(ContextHandler.java:548)
-	at org.mortbay.jetty.servlet.Context.startContext(Context.java:136)
-	at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1239)
-	at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:517)
-	at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:466)
-	at org.mortbay.jetty.plugin.Jetty6PluginWebAppContext.doStart(Jetty6PluginWebAppContext.java:124)
-	at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-	at org.mortbay.jetty.handler.HandlerCollection.doStart(HandlerCollection.java:152)
-	at org.mortbay.jetty.handler.ContextHandlerCollection.doStart(ContextHandlerCollection.java:156)
-	at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-	at org.mortbay.jetty.handler.HandlerCollection.doStart(HandlerCollection.java:152)
-	at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-	at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
-	at org.mortbay.jetty.Server.doStart(Server.java:222)
-	at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
-	at org.mortbay.jetty.plugin.Jetty6PluginServer.start(Jetty6PluginServer.java:132)
-	at org.mortbay.jetty.plugin.AbstractJettyMojo.startJetty(AbstractJettyMojo.java:441)
-	at org.mortbay.jetty.plugin.AbstractJettyMojo.execute(AbstractJettyMojo.java:383)
-	at org.mortbay.jetty.plugin.Jetty6RunWar.execute(Jetty6RunWar.java:67)
-	at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:453)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:559)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeStandaloneGoal(DefaultLifecycleExecutor.java:513)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:483)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:331)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:292)
-	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:142)
-	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:336)
-	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
-	at org.apache.maven.cli.MavenCli.main(MavenCli.java:301)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-	at java.lang.reflect.Method.invoke(Method.java:597)
-	at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
-	at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
-	at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
-	at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.i18n.I18nService' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.translation.TranslationService' while setting bean property 'translationService'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationService' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.translation.TranslationStore' while setting bean property 'translationStore'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationStore' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'sessionFactory' while setting bean property 'sessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sessionFactory' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'dataSource' while setting bean property 'dataSource'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 55 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationService' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.translation.TranslationStore' while setting bean property 'translationStore'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationStore' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'sessionFactory' while setting bean property 'sessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sessionFactory' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'dataSource' while setting bean property 'dataSource'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 68 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.translation.TranslationStore' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-i18n-db-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'sessionFactory' while setting bean property 'sessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sessionFactory' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'dataSource' while setting bean property 'dataSource'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 81 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sessionFactory' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'dataSource' while setting bean property 'dataSource'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 94 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'dataSource' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'driverClassName' while setting bean property 'driverClass'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 107 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'driverClassName' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Cannot resolve reference to bean 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' while setting bean property 'hibernateConfigurationProvider'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:275)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:104)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1245)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1010)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:472)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 120 more
-Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.hisp.dhis.hibernate.HibernateConfigurationProvider' defined in URL [jar:file:/C:/Coding/DHIS-Patient/dhis-patient/dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/target/work/webapp/WEB-INF/lib/dhis-support-hibernate-2.0.3-SNAPSHOT.jar!/META-INF/dhis/beans.xml]: Invocation of init method failed; nested exception is org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1338)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:473)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory$1.run(AbstractAutowireCapableBeanFactory.java:409)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:380)
-	at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:264)
-	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:261)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:185)
-	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:164)
-	at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:269)
-	... 133 more
-Caused by: org.hibernate.InvalidMappingException: Could not read mapping documents from jar: dhis-service-core-2.0.3-SNAPSHOT.jar
-	at org.hibernate.cfg.Configuration.addJar(Configuration.java:627)
-	at org.hisp.dhis.hibernate.DefaultHibernateConfigurationProvider.initialise(DefaultHibernateConfigurationProvider.java:120)
-	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-	at java.lang.reflect.Method.invoke(Method.java:597)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeCustomInitMethod(AbstractAutowireCapableBeanFactory.java:1414)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1375)
-	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1335)
-	... 143 more
-Caused by: org.hibernate.MappingException: class org.hisp.dhis.activityplan.ActivityPlan not found while looking for property: id
-	at org.hibernate.util.ReflectHelper.reflectedPropertyClass(ReflectHelper.java:74)
-	at org.hibernate.mapping.SimpleValue.setTypeUsingReflection(SimpleValue.java:279)
-	at org.hibernate.cfg.HbmBinder.bindSimpleId(HbmBinder.java:401)
-	at org.hibernate.cfg.HbmBinder.bindRootPersistentClassCommonValues(HbmBinder.java:334)
-	at org.hibernate.cfg.HbmBinder.bindRootClass(HbmBinder.java:273)
-	at org.hibernate.cfg.HbmBinder.bindRoot(HbmBinder.java:144)
-	at org.hibernate.cfg.Configuration.add(Configuration.java:675)
-	at org.hibernate.cfg.Configuration.addInputStream(Configuration.java:510)
-	at org.hibernate.cfg.Configuration.addJar(Configuration.java:624)
-	... 151 more
-Caused by: java.lang.ClassNotFoundException: org.hisp.dhis.activityplan.ActivityPlan
-	at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-	at java.security.AccessController.doPrivileged(Native Method)
-	at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-	at java.lang.ClassLoader.loadClass(ClassLoader.java:307)
-	at org.codehaus.classworlds.RealmClassLoader.loadClassDirect(RealmClassLoader.java:195)
-	at org.codehaus.classworlds.DefaultClassRealm.loadClass(DefaultClassRealm.java:255)
-	at org.codehaus.classworlds.DefaultClassRealm.loadClass(DefaultClassRealm.java:274)
-	at org.codehaus.classworlds.RealmClassLoader.loadClass(RealmClassLoader.java:214)
-	at java.lang.ClassLoader.loadClass(ClassLoader.java:252)
-	at org.mortbay.jetty.webapp.WebAppClassLoader.loadClass(WebAppClassLoader.java:401)
-	at org.mortbay.jetty.webapp.WebAppClassLoader.loadClass(WebAppClassLoader.java:363)
-	at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:320)
-	at java.lang.Class.forName0(Native Method)
-	at java.lang.Class.forName(Class.java:169)
-	at org.hibernate.util.ReflectHelper.classForName(ReflectHelper.java:100)
-	at org.hibernate.util.ReflectHelper.reflectedPropertyClass(ReflectHelper.java:70)
-	... 159 more
-[INFO] Started Jetty Server
-[INFO] Jetty server exiting.
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 42 seconds
-[INFO] Finished at: Wed Sep 23 00:23:26 CEST 2009
-[INFO] Final Memory: 18M/36M
-[INFO] ------------------------------------------------------------------------
-Terminate batch job (Y/N)? 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientAction.java	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientAction.java	2009-09-23 21:10:32 +0000
@@ -24,10 +24,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package org.hisp.dhis.patient.action.patient;
 
-import org.hisp.dhis.patient.PatientAddressService;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientIdentifier;
 import org.hisp.dhis.patient.PatientIdentifierService;
 import org.hisp.dhis.patient.PatientService;
 
@@ -40,6 +40,7 @@
 public class GetPatientAction
     implements Action
 {
+
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -56,19 +57,33 @@
     public void setPatientIdentifierService( PatientIdentifierService patientIdentifierService )
     {
         this.patientIdentifierService = patientIdentifierService;
-    }
-
-    private PatientAddressService patientAddressService;
-
-    public void setPatientAddressService( PatientAddressService patientAddressService )
-    {
-        this.patientAddressService = patientAddressService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
+    }    
+   
+    // -------------------------------------------------------------------------
+    // Input/Output
+    // -------------------------------------------------------------------------
+
+    private int id;
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
+
+    private Patient patient;
+
+    public Patient getPatient()
+    {
+        return patient;
+    }
+                              
+    private PatientIdentifier patientIdentifier;
+    
+    public PatientIdentifier getPatientIdentifier()
+    {
+        return patientIdentifier;
+    }
+    
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -76,6 +91,11 @@
     public String execute()
         throws Exception
     {
+
+        patient = patientService.getPatient( id );  
+        
+        patientIdentifier = patientIdentifierService.getPatientIdentifier( patient );
+        
         return SUCCESS;
     }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemovePatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemovePatientAction.java	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/RemovePatientAction.java	2009-09-23 21:10:32 +0000
@@ -42,7 +42,7 @@
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
-
+                           
     private PatientService patientService;
 
     public void setPatientService( PatientService patientService )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java	2009-09-23 21:10:32 +0000
@@ -28,18 +28,19 @@
 package org.hisp.dhis.patient.action.patient;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientService;
 
 import com.opensymphony.xwork2.Action;
 
 /**
  * @author Abyot Asalefew Gizaw
  * @version $Id$
- */
+ */             
 public class SearchPatientAction
     implements Action
 {
@@ -54,6 +55,13 @@
     {
         this.selectionManager = selectionManager;
     }
+    
+    private PatientService patientService;
+
+    public void setPatientService( PatientService patientService )
+    {
+        this.patientService = patientService;
+    }
 
     // -------------------------------------------------------------------------
     // Input/output
@@ -78,9 +86,9 @@
         return searchText;
     }
 
-    private List<Patient> patients = new ArrayList<Patient>();
+    private Collection<Patient> patients = new ArrayList<Patient>();
 
-    public List<Patient> getPatients()
+    public Collection<Patient> getPatients()
     {
         return patients;
     }
@@ -97,6 +105,8 @@
         // ---------------------------------------------------------------------
 
         organisationUnit = selectionManager.getSelectedOrganisationUnit();
+        
+        patients = patientService.getPatients( searchText );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java	2009-09-23 21:10:32 +0000
@@ -64,7 +64,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // Output
+    // Input/Output
     // -------------------------------------------------------------------------
 
     private PatientIdentifier patientIdentifier;
@@ -82,10 +82,6 @@
     }
 
     // -------------------------------------------------------------------------
-    // Input
-    // --------------------------------------------------------------------------
-
-    // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
 
@@ -93,7 +89,7 @@
     {
         OrganisationUnit organisationUnit = selectionManager.getSelectedOrganisationUnit();
 
-        identifier = patientIdentifierService.getNextIdentifierForOrgUnit( organisationUnit );        
+        identifier = patientIdentifierService.getNextIdentifierForOrgUnit( organisationUnit );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/UpdatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/UpdatePatientAction.java	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/UpdatePatientAction.java	2009-09-23 21:10:32 +0000
@@ -24,13 +24,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package org.hisp.dhis.patient.action.patient;
 
-import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientAddressService;
 import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.i18n.I18nFormat;
 
 import com.opensymphony.xwork2.Action;
 
@@ -41,6 +39,7 @@
 public class UpdatePatientAction
     implements Action
 {
+
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -58,13 +57,7 @@
     {
         this.patientService = patientService;
     }
-
-    private PatientAddressService patientAddressService;
-
-    public void setPatientAddressService( PatientAddressService patientAddressService )
-    {
-        this.patientAddressService = patientAddressService;
-    }
+   
 
     // -------------------------------------------------------------------------
     // Input - Id
@@ -120,6 +113,7 @@
         this.gender = gender;
     }
 
+    /*
     // -------------------------------------------------------------------------
     // Input - address
     // -------------------------------------------------------------------------
@@ -171,7 +165,7 @@
     public void setPostalCode( String postalCode )
     {
         this.postalCode = postalCode;
-    }
+    }*/
 
     // -------------------------------------------------------------------------
     // Action implementation
@@ -180,6 +174,7 @@
     public String execute()
         throws Exception
     {
+
         // ---------------------------------------------------------------------
         // Update patient
         // ---------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2009-09-28 15:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2009-09-23 21:10:32 +0000
@@ -81,23 +81,24 @@
       ref="org.hisp.dhis.patient.PatientService"/>  
   </bean>
 	
-  <!-- Patient -->
-  
-  <bean id="org.hisp.dhis.patient.action.patient.PatientHomeAction"
-    class="org.hisp.dhis.patient.action.patient.PatientHomeAction" 
-    scope="prototype">                
-  </bean>
-  
+  <!-- Patient -->  
+		    
   <bean id="org.hisp.dhis.patient.action.patient.SearchPatientAction"
     class="org.hisp.dhis.patient.action.patient.SearchPatientAction" 
     scope="prototype">
     <property name="selectionManager"
       ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager"/>
+	<property name="patientService"
+      ref="org.hisp.dhis.patient.PatientService"/>	    
   </bean>
     
   <bean id="org.hisp.dhis.patient.action.patient.GetPatientAction"
     class="org.hisp.dhis.patient.action.patient.GetPatientAction" 
     scope="prototype">    
+	<property name="patientService"
+      ref="org.hisp.dhis.patient.PatientService"/>
+    <property name="patientIdentifierService"
+      ref="org.hisp.dhis.patient.PatientIdentifierService"/>  
   </bean>
   
   <bean id="org.hisp.dhis.patient.action.patient.AddPatientAction"
@@ -105,19 +106,19 @@
     scope="prototype">
     <property name="selectionManager"
       ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager"/>
+	<property name="patientService"
+      ref="org.hisp.dhis.patient.PatientService"/>
+    <property name="patientIdentifierService"
+      ref="org.hisp.dhis.patient.PatientIdentifierService"/>          
   </bean> 
 	
   <bean id="org.hisp.dhis.patient.action.patient.RemovePatientAction"
-    class="org.hisp.dhis.patient.action.household.RemovePatientAction" 
+    class="org.hisp.dhis.patient.action.patient.RemovePatientAction" 
     scope="prototype">      
     <property name="patientService"
       ref="org.hisp.dhis.patient.PatientService"/>         
-  </bean>  
+  </bean> 
   
-  <bean id="org.hisp.dhis.patient.action.patient.ShowUpdatePatientFormAction"
-    class="org.hisp.dhis.patient.action.patient.ShowUpdatePatientFormAction" 
-    scope="prototype">       
-  </bean>
     
   <bean id="org.hisp.dhis.patient.action.patient.ShowAddPatientFormAction"
     class="org.hisp.dhis.patient.action.patient.ShowAddPatientFormAction" 
@@ -135,6 +136,7 @@
       ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager"/>           
   </bean>   
 
+	        
   <bean id="org.hisp.dhis.patient.action.patient.ValidatePatientAction"
     class="org.hisp.dhis.patient.action.patient.ValidatePatientAction" 
     scope="prototype">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2009-09-23 21:10:32 +0000
@@ -67,7 +67,7 @@
 edit = Edit
 remove = Remove
 show_details = Show Details
-confirm_death_individual = Are you sure this individual is dead?
+confirm_death_patient = Are you sure this person is dead?
 adding_individual_failed = Adding Individual failed
 updating_individual_failed = Updating Individual failed
 confirm_delete_patient = Are you sure you want to delete the patient?

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2009-09-23 21:10:32 +0000
@@ -104,7 +104,7 @@
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param>            
     </action>    
         
-    <action name="searchPatient" class="org.hisp.dhis.paient.action.patient.SearchPatientAction">
+    <action name="searchPatient" class="org.hisp.dhis.patient.action.patient.SearchPatientAction">
       <interceptor-ref name="organisationUnitTreeStack"/>
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-patient/listPatient.vm</param>
@@ -112,19 +112,19 @@
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param>            
     </action> 
     
-    <action name="getPatient" class="org.hisp.dhis.paient.action.patient.GetPatientAction">
-      <result name="success" type="velocity-xml">/dhis-web-chis-registration/responsePatient.vm</result>
+    <action name="getPatient" class="org.hisp.dhis.patient.action.patient.GetPatientAction">
+      <result name="success" type="velocity-xml">/dhis-web-maintenance-patient/responsePatient.vm</result>
       <param name="onExceptionReturn">plainTextError</param>      
     </action>
     
-    <action name="removePatient" class="org.hisp.dhis.paient.action.patient.RemovePatientAction">
+    <action name="removePatient" class="org.hisp.dhis.patient.action.patient.RemovePatientAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-patient/responseSuccess.vm</result>
       <result name="error" type="velocity-xml">/dhis-web-maintenance-patient/responseError.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_PATIENT_DELETE</param>      
     </action>
     
-    <action name="addPatient" class="org.hisp.dhis.paient.action.patient.AddPatientAction">
+    <action name="addPatient" class="org.hisp.dhis.patient.action.patient.AddPatientAction">
       <result name="success" type="redirect">patient.action</result>
       <param name="requiredAuthorities">F_PATIENT_ADD</param>
     </action>
@@ -138,7 +138,7 @@
       <param name="requiredAuthorities">F_PATIENT_ADD</param>      
     </action>           
    
-    <action name="showUpdatePatientForm" class="org.hisp.dhis.paient.action.patient.ShowUpdatePatientFormAction">
+    <action name="showUpdatePatientForm" class="org.hisp.dhis.patient.action.patient.GetPatientAction">
       <interceptor-ref name="organisationUnitTreeStack"/>
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-patient/updatePatientForm.vm</param>
@@ -148,13 +148,13 @@
     </action>
     
     <action name="updatePatient"
-      class="org.hisp.dhis.paient.action.patient.UpdatePatientAction">
+      class="org.hisp.dhis.patient.action.patient.UpdatePatientAction">
       <result name="success" type="redirect">patient.action</result>
       <param name="requiredAuthorities">F_PATIENT_UPDATE</param>
     </action>
     
     <action name="validatePatient"
-      class="org.hisp.dhis.paient.action.patient.ValidatePatientAction">
+      class="org.hisp.dhis.patient.action.patient.ValidatePatientAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-patient/responseSuccess.vm</result>
       <result name="error" type="velocity-xml">/dhis-web-maintenance-patient/responseError.vm</result>
       <result name="input" type="velocity-xml">/dhis-web-maintenance-patient/responseInput.vm</result>
@@ -162,7 +162,7 @@
     </action>
     
     <action name="validateSearchPatient"
-      class="org.hisp.dhis.paient.action.patient.ValidateSearchPatientAction">
+      class="org.hisp.dhis.patient.action.patient.ValidateSearchPatientAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-patient/responseSuccess.vm</result>
       <result name="error" type="velocity-xml">/dhis-web-maintenance-patient/responseError.vm</result>
       <result name="input" type="velocity-xml">/dhis-web-maintenance-patient/responseInput.vm</result>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js	2009-09-23 21:10:32 +0000
@@ -61,7 +61,7 @@
 
 function removePatient( patientId, firstName, lastName )
 {
-    var result = window.confirm( i18n_confirm_death + '\n\n' + lastName + ',' + firstName );
+    var result = window.confirm( i18n_confirm_delete + '\n\n' + lastName + ',' + firstName );
     
     if ( result )
     {
@@ -134,9 +134,7 @@
 // -----------------------------------------------------------------------------
 
 function validateAddPatient()
-{	
-	
-	window.alert( 'am called ... validateAddPatient' );
+{
 	
 	var url = 'validatePatient.action?' +
 			'identifier=' + getFieldValue( 'identifier' ) +

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2009-09-23 21:10:32 +0000
@@ -19,7 +19,6 @@
           <col>
           <col>
           <col>
-          <col>
           <col width="20">
           <col width="20">
           <col width="20">
@@ -37,8 +36,7 @@
           <tr>
             <th>$i18n.getString( "first_name" )</th>
             <th>$i18n.getString( "middle_name" )</th>
-            <th>$i18n.getString( "last_name" )</th>
-            <th>$i18n.getString( "age" )</th>
+            <th>$i18n.getString( "last_name" )</th>            
             <th>$i18n.getString( "gender" )</th>
             <th>$i18n.getString( "date_of_birth" )</th>            
             <th colspan="4">$i18n.getString( "operations" )</th>
@@ -50,39 +48,36 @@
           #foreach( $patient in $patients )
           	<tr #alternate( $mark )>
 				<td>			
-					$encoder.htmlEncode( $patient.givenName )
+					$encoder.htmlEncode( $patient.firstName )
 				</td>
 				<td>			
 					$encoder.htmlEncode( $patient.middleName )
 				</td>
 				<td>			
-					$encoder.htmlEncode( $patient.familyName )
-				</td>
-				<td>			
-					$encoder.htmlEncode( $patient.age )
-				</td>
+					$encoder.htmlEncode( $patient.lastName )
+				</td>				
 				<td>			
 					$encoder.htmlEncode( $patient.gender )
 				</td>
 				<td>			
-					$encoder.htmlEncode( $patient.birthdate )
+					$encoder.htmlEncode( $patient.birthDate )
 				</td>
 				
 				<td style="text-align:center"#alternate( $mark )>
-                  ##<a href="showMemberShipForm.action?id=$patient.patientId" title="$i18n.getString( "manage_membership" )"><img src="../images/assign.png" alt="$i18n.getString( "manage_membership" )"></a>
+                  ##<a href="showMemberShipForm.action?id=$patient.id" title="$i18n.getString( "manage_membership" )"><img src="../images/assign.png" alt="$i18n.getString( "manage_membership" )"></a>
                   <a href="#" title="$i18n.getString( "manage_membership" )"><img src="../images/assign.png" alt="$i18n.getString( "manage_membership" )"></a>
                 </td>
                 
                 <td style="text-align:center"#alternate( $mark )>
-                  <a href="showUpdatePatientForm.action?id=$patient.patientId" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+                  <a href="showUpdatePatientForm.action?id=$patient.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
                 </td>                
  
                 <td style="text-align:center"#alternate( $mark )>
-                  <a href="javascript:removePatient( '$patient.patientId', '$encoder.jsEncode( $patient.givenName )', '$encoder.jsEncode( $patient.familyName )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+                  <a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.firstName )', '$encoder.jsEncode( $patient.lastName )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
                 </td>            
                 
                 <td style="text-align:center"#alternate( $mark )>
-                  <a href="javascript:showPatientDetails( $patient.patientId )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+                  <a href="javascript:showPatientDetails( $patient.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
                 </td>
 				
 			</tr>
@@ -101,13 +96,12 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>				
-				<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
-				<p><label>$i18n.getString( "house_number" ):</label><br><span id="houseNumberField"></span></p>
-				<p><label>$i18n.getString( "registering_unit" ):</label><br><span id="registeringUnitField"></span></p>
-				<p><label>$i18n.getString( "address" ):</label><br><span id="addressField"></span></p>
-				<p><label>$i18n.getString( "land_mark" ):</label><br><span id="landMarkField"></span></p>
-				<p><label>$i18n.getString( "no_of_house_hold_members" ):</label><br><span id="memberCountField"></span></p>
-			</div>
+				    <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+				    <p><label>$i18n.getString( "firstName" ):</label><br><span id="firstNameField"></span></p>				
+				    <p><label>$i18n.getString( "middleName" ):</label><br><span id="middleNameField"></span></p>
+				    <p><label>$i18n.getString( "lastName" ):</label><br><span id="lastNameField"></span></p>
+				    <p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>
+			    </div>
 
 		</td>
   </tr>
@@ -116,8 +110,9 @@
 <span id="message"></span>
 
 <script type="text/javascript">
-	var i18n_confirm_death = '$encoder.jsEscape( $i18n.getString( "confirm_death_patient" ) , "'" )';
+	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient" ) , "'" )';
 	var i18n_adding_patient_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_failed" ), "'")';
 	var i18n_updating_patient_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_failed" ), "'")';	
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
 </script>
+

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatient.vm	2009-09-23 10:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatient.vm	2009-09-23 21:10:32 +0000
@@ -9,6 +9,3 @@
 	<identifier>$!encoder.xmlEncode( $patientIdentifier.identifier )</identifier>
 </patientIdentifier>
 
-<patientAddress>
-	<house>$!encoder.xmlEncode( $patientAddress.house.name )</house>
-</patientAddress>

