Merge branch 'master' of https://github.com/jlkeiper/openmrs-module-a…

…mrsmobileforms into MOB-21
ojwanganto · Jan 10, 2013 · ff773ec · ff773ec
2 parents a8bafd5 + 5382ce8
commit ff773ec
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 49 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -13,8 +13,23 @@
 	<description>API project for AMRS Mobile Forms</description>
 
 	<dependencies>
-
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>  
+		</dependency>
+
 		<dependency>
+			<groupId>net.sf.kxml</groupId>
+			<artifactId>kxml2</artifactId>
+		</dependency>
+
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jzlib</artifactId>
+        </dependency>
+
+        <dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>household-api</artifactId>
 		</dependency>

diff --git a/omod/src/main/resources/Economic.hbm.xml → api/src/main/resources/Economic.hbm.xml b/omod/src/main/resources/Economic.hbm.xml → api/src/main/resources/Economic.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="Economic" table="mobileformentry_economic">
 

diff --git a/...main/resources/EconomicConceptMap.hbm.xml → ...main/resources/EconomicConceptMap.hbm.xml b/...main/resources/EconomicConceptMap.hbm.xml → ...main/resources/EconomicConceptMap.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="EconomicConceptMap" table="mobileformentry_economic_concept_map">
 

diff --git a/...src/main/resources/EconomicObject.hbm.xml → ...src/main/resources/EconomicObject.hbm.xml b/...src/main/resources/EconomicObject.hbm.xml → ...src/main/resources/EconomicObject.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="EconomicObject" table="mobileformentry_economic_object">
 

diff --git a/...rc/main/resources/HouseholdMember.hbm.xml → ...rc/main/resources/HouseholdMember.hbm.xml b/...rc/main/resources/HouseholdMember.hbm.xml → ...rc/main/resources/HouseholdMember.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="HouseholdMember" table="mobileformentry_household_member">
 

diff --git a/...in/resources/MobileFormEntryError.hbm.xml → ...in/resources/MobileFormEntryError.hbm.xml b/...in/resources/MobileFormEntryError.hbm.xml → ...in/resources/MobileFormEntryError.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="MobileFormEntryError" table="mobileformentry_error">
 

diff --git a/...ain/resources/MobileFormHousehold.hbm.xml → ...ain/resources/MobileFormHousehold.hbm.xml b/...ain/resources/MobileFormHousehold.hbm.xml → ...ain/resources/MobileFormHousehold.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="MobileFormHousehold" table="mobileformentry_household">
 

diff --git a/omod/src/main/resources/Survey.hbm.xml → api/src/main/resources/Survey.hbm.xml b/omod/src/main/resources/Survey.hbm.xml → api/src/main/resources/Survey.hbm.xml
@@ -3,7 +3,7 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
-<hibernate-mapping package="@MODULE_PACKAGE@">
+<hibernate-mapping package="org.openmrs.module.amrsmobileforms">
 
 	<class name="Survey" table="mobileformentry_household_survey">
 

diff --git a/...leforms/HouseholdModuleConverterTest.java → ...leforms/HouseholdModuleConverterTest.java b/...leforms/HouseholdModuleConverterTest.java → ...leforms/HouseholdModuleConverterTest.java
diff --git a/api/src/test/resources/TestingApplicationContext.xml b/api/src/test/resources/TestingApplicationContext.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context
+		http://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/util
+		http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+    <bean parent="serviceContext">
+        <property name="moduleService">
+            <list>
+                <value>org.openmrs.module.amrsmobileforms.MobileFormEntryService</value> <!-- service interface name -->
+                <bean class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+                    <property name="transactionManager">
+                        <ref bean="transactionManager" />
+                    </property>
+                    <property name="target">
+                        <bean class="org.openmrs.module.amrsmobileforms.impl.MobileFormEntryServiceImpl">
+                            <property name="mobileFormEntryDAO">
+                                <bean class="org.openmrs.module.amrsmobileforms.db.hibernate.HibernateMobileFormEntryDAO">
+                                    <property name="sessionFactory">
+                                        <ref bean="sessionFactory" />
+                                    </property>
+                                </bean>
+                            </property>
+                        </bean>
+                    </property>
+                    <property name="preInterceptors">
+                        <ref bean="serviceInterceptors" />
+                    </property>
+                    <property name="transactionAttributeSource">
+                        <bean class="org.springframework.transaction.annotation.AnnotationTransactionAttributeSource" />
+                    </property>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <context:component-scan base-package="org.openmrs.module.amrsmobileforms" />
+
+    <bean id="sessionFactory" class="org.openmrs.api.db.hibernate.HibernateSessionFactoryBean">
+        <property name="configLocations">
+            <list>
+                <value>classpath:hibernate.cfg.xml</value>
+                <value>classpath:test-hibernate.cfg.xml</value>
+            </list>
+        </property>
+        <property name="mappingJarLocations">
+            <ref bean="mappingJarResources"/>
+        </property>
+    </bean>
+
+</beans>
diff --git a/...eforms/test/include/testHouseholdData.xml → ...eforms/test/include/testHouseholdData.xml b/...eforms/test/include/testHouseholdData.xml → ...eforms/test/include/testHouseholdData.xml
diff --git a/api/src/test/resources/test-hibernate.cfg.xml b/api/src/test/resources/test-hibernate.cfg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+        <mapping resource="Economic.hbm.xml" />
+        <mapping resource="EconomicConceptMap.hbm.xml" />
+        <mapping resource="EconomicObject.hbm.xml" />
+        <mapping resource="HouseholdMember.hbm.xml" />
+        <mapping resource="MobileFormEntryError.hbm.xml" />
+        <mapping resource="MobileFormHousehold.hbm.xml" />
+        <mapping resource="Survey.hbm.xml" />
+    </session-factory>
+</hibernate-configuration>
diff --git a/omod/src/main/resources/moduleApplicationContext.xml b/omod/src/main/resources/moduleApplicationContext.xml
@@ -40,6 +40,6 @@
 		</property>
 	</bean>
 
-	<context:component-scan base-package="@MODULE_PACKAGE@" />
+	<context:component-scan base-package="org.openmrs.module.amrsmobileforms" />
 
 </beans>
diff --git a/omod/src/test/resources/TestingApplicationContext.xml b/omod/src/test/resources/TestingApplicationContext.xml
diff --git a/omod/src/test/resources/test-hibernate.cfg.xml b/omod/src/test/resources/test-hibernate.cfg.xml
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,28 @@
 	<dependencyManagement>
 		<dependencies>
 
-			<dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.9.0</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>net.sf.kxml</groupId>
+                <artifactId>kxml2</artifactId>
+                <version>2.3.0</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.jcraft</groupId>
+                <artifactId>jzlib</artifactId>
+                <version>1.1.1</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
 				<groupId>org.openmrs.module</groupId>
 				<artifactId>xforms</artifactId>
 				<version>3.9.5</version>