dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06344
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1999: Fixed bugs to run other india modules Linelisting, ExcelImport, Validation, Configuration
------------------------------------------------------------
revno: 1999
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-06-17 13:21:57 +0530
message:
Fixed bugs to run other india modules Linelisting,ExcelImport,Validation,Configuration
modified:
local/in/dhis-web-dataentry-linelisting/pom.xml
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java
local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dataentry-linelisting/src/main/webapp/WEB-INF/web.xml
local/in/dhis-web-excelimport/pom.xml
local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-excelimport/src/main/webapp/WEB-INF/web.xml
local/in/dhis-web-maintenance-in/pom.xml
local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-validationrule-in/pom.xml
local/in/dhis-web-validationrule-in/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-validationrule-in/src/main/webapp/WEB-INF/web.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/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2010-06-07 06:41:39 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2010-06-17 07:51:57 +0000
@@ -56,11 +56,12 @@
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
</dependency>
-
+<!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
+-->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2010-06-17 07:51:57 +0000
@@ -27,9 +27,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-06-17 07:51:57 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<bean id="org.hisp.dhis.den.action.EmptyAction"
class="org.hisp.dhis.den.action.EmptyAction"/>
@@ -15,8 +15,8 @@
ref="org.hisp.dhis.period.PeriodService"/>
<property name="dataElementService"
ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
<bean id="org.hisp.dhis.den.api.LLDataValueService"
@@ -58,8 +58,8 @@
ref="org.hisp.dhis.datavalue.DataValueService"/>
<property name="currentUserService"
ref="org.hisp.dhis.user.CurrentUserService"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
<!-- Actions -->
@@ -73,7 +73,7 @@
<property name="dataElementService"
ref="org.hisp.dhis.dataelement.DataElementService"/>
<property name="dataEntryFormService"
- ref="org.hisp.dhis.dataset.DataEntryFormService"/>
+ ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
<property name="sectionService"
ref="org.hisp.dhis.dataset.SectionService"/>
</bean>
@@ -99,15 +99,15 @@
<property name="dataElementService"
ref="org.hisp.dhis.dataelement.DataElementService"/>
<property name="dataEntryFormService"
- ref="org.hisp.dhis.dataset.DataEntryFormService"/>
+ ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
<property name="standardCommentsManager"
ref="org.hisp.dhis.den.comments.StandardCommentsManager"/>
<property name="minMaxDataElementService"
ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
<property name="selectedStateManager"
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
<bean id="org.hisp.dhis.den.action.multidimensional.FormAction"
@@ -124,10 +124,10 @@
ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
<property name="selectedStateManager"
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
<property name="dataEntryFormService"
- ref="org.hisp.dhis.dataset.DataEntryFormService"/>
+ ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
<property name="dataElementDimensionRowOrderService">
<ref bean="org.hisp.dhis.dataelement.DataElementDimensionRowOrderService"/>
</property>
@@ -184,8 +184,8 @@
ref="org.hisp.dhis.den.api.LLDataValueService"/>
<property name="selectedStateManager"
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
@@ -199,8 +199,8 @@
ref="org.hisp.dhis.den.api.LLDataValueService"/>
<property name="selectedStateManager"
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
<bean id="org.hisp.dhis.den.action.SaveCommentAction"
@@ -335,8 +335,8 @@
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
<property name="dataElementCategoryComboService"
ref="org.hisp.dhis.dataelement.DataElementCategoryComboService"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</bean>
<bean id="org.hisp.dhis.den.action.MinMaxGeneratingAction"
@@ -367,7 +367,7 @@
<property name="selectedStateManager"
ref="org.hisp.dhis.den.state.SelectedStateManager"/>
</bean>
-
+<!--
<bean id="org.hisp.dhis.den.util.DBConnection"
class="org.hisp.dhis.den.util.DBConnection" scope="prototype">
<property name="provider"
@@ -379,6 +379,7 @@
<property name="lldataValueService"
ref="org.hisp.dhis.den.api.LLDataValueService"/>
</bean>
+ -->
<!-- Auto Linelisting Aggregation -->
@@ -398,8 +399,8 @@
ref="org.hisp.dhis.datavalue.DataValueService"/>
<property name="lldataValueService"
ref="org.hisp.dhis.den.api.LLDataValueService"/>
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
<property name="organisationUnitService"
ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
<property name="dataSetService"
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/WEB-INF/web.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/WEB-INF/web.xml 2010-06-17 07:51:57 +0000
@@ -50,7 +50,7 @@
<filter-name>Struts</filter-name>
<url-pattern>*.action</url-pattern>
</filter-mapping>
-
+<!--
<servlet>
<servlet-name>jcaptcha</servlet-name>
<servlet-class>org.hisp.dhis.security.action.CaptchaImageServlet</servlet-class>
@@ -67,7 +67,7 @@
<servlet-name>captchaValidator</servlet-name>
<url-pattern>/dhis-web-commons/security/captchaValidator</url-pattern>
</servlet-mapping>
-
+-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml 2010-06-07 06:41:39 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2010-06-17 07:51:57 +0000
@@ -74,7 +74,7 @@
<!-- Other -->
-
+ <!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
@@ -83,5 +83,8 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
+
+ -->
+
</dependencies>
</project>
=== modified file 'local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2010-06-17 07:51:57 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Import Form -->
@@ -128,8 +128,8 @@
<property name="dataValueService">
<ref bean="org.hisp.dhis.datavalue.DataValueService"/>
</property>
- <property name="dataElementCategoryOptionComboService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService"/>
+ <property name="dataElementCategoryService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
</property>
<property name="configurationService">
<ref bean="org.hisp.dhis.config.ConfigurationService"/>
=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-excelimport/src/main/webapp/WEB-INF/web.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/WEB-INF/web.xml 2010-06-17 07:51:57 +0000
@@ -51,6 +51,7 @@
<url-pattern>*.action</url-pattern>
</filter-mapping>
+ <!--
<servlet>
<servlet-name>jcaptcha</servlet-name>
<servlet-class>org.hisp.dhis.security.action.CaptchaImageServlet</servlet-class>
@@ -67,7 +68,7 @@
<servlet-name>captchaValidator</servlet-name>
<url-pattern>/dhis-web-commons/security/captchaValidator</url-pattern>
</servlet-mapping>
-
+-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml 2010-06-17 07:51:57 +0000
@@ -55,10 +55,11 @@
</dependency>
<!-- Other -->
-
+ <!--
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
+ -->
</dependencies>
</project>
=== modified file 'local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml 2010-06-17 07:51:57 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<bean id="org.hisp.dhis.config.action.NoAction"
=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml 2010-06-07 06:41:39 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml 2010-06-17 07:51:57 +0000
@@ -67,10 +67,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
+ -->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'local/in/dhis-web-validationrule-in/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-validationrule-in/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-validationrule-in/src/main/resources/META-INF/dhis/beans.xml 2010-06-17 07:51:57 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<bean id="org.hisp.dhis.validationrule.action.NoAction"
class="org.hisp.dhis.validationrule.action.NoAction">
=== modified file 'local/in/dhis-web-validationrule-in/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-validationrule-in/src/main/webapp/WEB-INF/web.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-validationrule-in/src/main/webapp/WEB-INF/web.xml 2010-06-17 07:51:57 +0000
@@ -50,7 +50,7 @@
<filter-name>Struts</filter-name>
<url-pattern>*.action</url-pattern>
</filter-mapping>
-
+<!--
<servlet>
<servlet-name>jcaptcha</servlet-name>
<servlet-class>org.hisp.dhis.security.action.CaptchaImageServlet</servlet-class>
@@ -67,7 +67,7 @@
<servlet-name>captchaValidator</servlet-name>
<url-pattern>/dhis-web-commons/security/captchaValidator</url-pattern>
</servlet-mapping>
-
+-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
