Merge pull request #3 from samuelmale/migrate-platform-2_x

Migrate to OpenMRS 2.x
SIGDEP-3 · Jan 24, 2024 · f0890ee · f0890ee
2 parents 91285c1 + 61dbf74
commit f0890ee
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/...va/org/openmrs/module/hivscreening/api/db/hibernate/HibernateHivScreeningRegisterDAO.java b/...va/org/openmrs/module/hivscreening/api/db/hibernate/HibernateHivScreeningRegisterDAO.java
@@ -16,9 +16,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
-import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.openmrs.api.db.hibernate.DbSessionFactory;
 import org.openmrs.module.hivscreening.HivScreening;
 import org.openmrs.module.hivscreening.ScreeningRegisterInfo;
 import org.openmrs.module.hivscreening.TestingKit;
@@ -32,19 +32,19 @@
 public class HibernateHivScreeningRegisterDAO implements HivScreeningRegisterDAO {
 	protected final Log log = LogFactory.getLog(this.getClass());
 
-	private SessionFactory sessionFactory;
+	private DbSessionFactory sessionFactory;
 
 	/**
      * @param sessionFactory the sessionFactory to set
      */
-    public void setSessionFactory(SessionFactory sessionFactory) {
+    public void setSessionFactory(DbSessionFactory sessionFactory) {
 	    this.sessionFactory = sessionFactory;
     }
 
 	/**
      * @return the sessionFactory
      */
-    public SessionFactory getSessionFactory() {
+    public DbSessionFactory getSessionFactory() {
 	    return sessionFactory;
     }
 

diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
@@ -35,7 +35,7 @@
 							<property name="dao">
 								<bean class="${project.parent.groupId}.${project.parent.artifactId}.api.db.hibernate.HibernateHivScreeningRegisterDAO">
 									<property name="sessionFactory">
-										<ref bean="sessionFactory" />
+										<ref bean="dbSessionFactory" />
 									</property>
 								</bean>
 							</property>

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -62,6 +62,12 @@
 
 		<!-- End OpenMRS core -->
 
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>legacyui-omod</artifactId>
+			<version>1.15.4-sigdep-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
 	</modules>
 
 	<properties>
-		<openMRSVersion>1.11.9</openMRSVersion>
+		<openMRSVersion>2.1.1</openMRSVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -85,6 +85,12 @@
 
 			<!-- End OpenMRS core -->
 
+			<dependency>
+				<groupId>org.openmrs.module</groupId>
+				<artifactId>legacyui-omod</artifactId>
+				<version>1.15.4-sigdep-SNAPSHOT</version>
+				<scope>provided</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -95,8 +101,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<target>1.6</target>
-						<source>1.6</source>
+						<target>1.8</target>
+						<source>1.8</source>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -114,6 +120,11 @@
 	</build>
 
 	<repositories>
+		<repository>
+			<id>uwdigi-repo-central</id>
+			<name>DIGI Public Repository</name>
+			<url>https://packages.uwdigi.org/artifactory/public</url>
+		</repository>
 		<repository>
 			<id>openmrs-repo</id>
 			<name>OpenMRS Nexus Repository</name>