correcting dependency issues in ugandaemr reports (#370)

Author: slubwama

api/src/main/resources/moduleApplicationContext.xml

@@ -9,44 +9,30 @@
 
 	<!-- Add here beans related to the API context -->
 	<context:component-scan base-package="org.openmrs.module.ugandaemrreports" />
-	<bean id="ugandaemrreports.reportService" parent="serviceContext">
+
+	<bean id="ugandaemrreports.UgandaEMRReportsService"
+		  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager">
+			<ref bean="transactionManager" />
+		</property>
+		<property name="target">
+			<bean class="org.openmrs.module.ugandaemrreports.api.impl.UgandaEMRReportsServiceImpl">
+				<property name="dao" ref="ugandaemrreports.HibernateUgandaEMRReportsDAO" />
+			</bean>
+		</property>
+		<property name="preInterceptors">
+			<ref bean="serviceInterceptors" />
+		</property>
+		<property name="transactionAttributeSource">
+			<ref bean="transactionAttributeSource" />
+		</property>
+	</bean>
+
+	<bean parent="serviceContext">
 		<property name="moduleService">
-			<list merge="true">
-				<value>org.openmrs.module.reportingcompatibility.service.ReportService</value>
-				<bean class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-					<property name="transactionManager"><ref bean="transactionManager"/></property>
-					<property name="target">
-						<bean class="org.openmrs.report.impl.ReportServiceImpl">
-							<property name="reportDAO">
-								<bean class="org.openmrs.report.db.hibernate.HibernateReportDAO">
-									<property name="sessionFactory"><ref bean="sessionFactory"/></property>
-								</bean>
-							</property>
-							<property name="renderers">
-								<map>
-									<entry>
-										<key><value>org.openmrs.web.report.CohortReportWebRenderer</value></key>
-										<bean class="org.openmrs.web.report.CohortReportWebRenderer"/>
-									</entry>
-									<entry>
-										<key><value>org.openmrs.report.impl.TsvReportRenderer</value></key>
-										<bean class="org.openmrs.report.impl.TsvReportRenderer"/>
-									</entry>
-									<entry>
-									<key><value>org.openmrs.report.impl.CsvReportRenderer</value></key>
-									<bean class="org.openmrs.report.impl.CsvReportRenderer"/>
-									</entry>
-								</map>
-							</property>
-						</bean>
-					</property>
-					<property name="preInterceptors">
-						<ref bean="serviceInterceptors" />
-					</property>
-					<property name="transactionAttributeSource">
-						<bean class="org.springframework.transaction.annotation.AnnotationTransactionAttributeSource"/>
-					</property>
-				</bean>
+			<list>
+				<value>org.openmrs.module.ugandaemrreports.api.UgandaEMRReportsService</value>
+				<ref bean="ugandaemrreports.UgandaEMRReportsService" />
 			</list>
 		</property>
 	</bean>

omod/pom.xml

@@ -110,7 +110,7 @@
             <groupId>org.openmrs.module</groupId>
             <artifactId>reportingcompatibility-api</artifactId>
             <version>${reportingCompatibilityVersion}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>