dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01754
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 551: Fixed errors in VN web modules.
------------------------------------------------------------
revno: 551
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-09-01 15:50:25 +0200
message:
Fixed errors in VN web modules.
removed:
local/vn/dhis-web-chr-form/src/main/resources/webwork.properties
local/vn/dhis-web-chr-form/src/main/webapp/META-INF/
local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF
local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/lib/
modified:
local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml
local/vn/dhis-web-chr-form/pom.xml
local/vn/dhis-web-chr-form/src/main/resources/struts.xml
local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/web.xml
local/vn/dhis-web-dataentry-chr/src/main/webapp/WEB-INF/web.xml
local/vn/dhis-web-vn-report/pom.xml
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java
local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java
local/vn/dhis-web-vn-report/src/main/resources/struts.xml
local/vn/dhis-web-vn-report/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/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml'
--- local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-service-chr/src/main/resources/org/hisp/dhis/vn/chr/hibernate/FormReport.hbm.xml 2009-09-01 13:50:25 +0000
@@ -33,11 +33,6 @@
<list-index base="0" column="form_order"/>
<many-to-many class="org.hisp.dhis.vn.chr.Form" column="formid" foreign-key="fk_reportid_dataelementid"/>
</list>
-
- <!-- <set name="forms" table="formassociations">
- <key column="formreportid"/>
- <many-to-many class="org.hisp.dhis.vn.chr.Form" column="formid"/>
- </set> -->
</class>
</hibernate-mapping>
=== modified file 'local/vn/dhis-web-chr-form/pom.xml'
--- local/vn/dhis-web-chr-form/pom.xml 2009-09-01 05:24:32 +0000
+++ local/vn/dhis-web-chr-form/pom.xml 2009-09-01 13:50:25 +0000
@@ -10,7 +10,7 @@
</parent>
<artifactId>dhis-web-chr-form</artifactId>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<name>DHIS Childreport Form</name>
<build>
=== modified file 'local/vn/dhis-web-chr-form/src/main/resources/struts.xml'
--- local/vn/dhis-web-chr-form/src/main/resources/struts.xml 2009-09-01 06:41:06 +0000
+++ local/vn/dhis-web-chr-form/src/main/resources/struts.xml 2009-09-01 13:50:25 +0000
@@ -29,7 +29,6 @@
<action name="listForm" class="org.hisp.dhis.vn.chr.form.action.ListFormAction">
<result name="success" type="chain">getVisibleForms</result>
<param name="page">/dhis-web-chr-form/forms.vm</param>
- <interceptor-ref name="transactionStack"/>
<param name="requiredAuthorities">F_LIST_FORM_CHR</param>
</action>
@@ -179,7 +178,6 @@
<param name="page">/dhis-web-chr-form/configuration.vm</param>
<param name="menu">/dhis-web-chr-form/menu.vm</param>
<param name="javascripts">javascripts/forms.js</param>
- <interceptor-ref name="transactionStack"/>
<param name="requiredAuthorities">F_FORM_CONFIGURATION_CHR</param>
</action>
@@ -204,7 +202,6 @@
<param name="menu">/dhis-web-chr-form/menu.vm</param>
<param name="javascripts">javascripts/forms.js</param>
<param name="stylesheets">styles/dhtmlgoodies_calendar.css</param>
- <interceptor-ref name="transactionStack"/>
</action>
<!-- Show List Object -->
@@ -261,7 +258,6 @@
<param name="page">/dhis-web-chr-form/listForm.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js</param>
<param name="menu">/dhis-web-chr-form/menu.vm</param>
- <interceptor-ref name="transactionStack"/>
<result name="error" type="velocity-xml">/dhis-web-chr-form/responseError.vm</result>
</action>
@@ -269,7 +265,6 @@
<action name="createForm" class="org.hisp.dhis.vn.chr.form.action.ListFormAction">
<result name="success" type="chain">getVisibleForms</result>
<param name="page">/dhis-web-chr-form/createForm.vm</param>
- <interceptor-ref name="transactionStack"/>
<param name="requiredAuthorities">F_CREATE_FORM_CHR</param>
</action>
@@ -322,7 +317,6 @@
<param name="page">/dhis-web-chr-form/createFormReport.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js</param>
<param name="menu">/dhis-web-chr-form/menu.vm</param>
- <interceptor-ref name="transactionStack"/>
<result name="error" type="velocity-xml">/dhis-web-chr-form/responseError.vm</result>
</action>
@@ -342,9 +336,7 @@
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js,javascripts/forms.js</param>
<param name="menu">/dhis-web-chr-form/menu.vm</param>
<result name="error" type="velocity-xml">/dhis-web-chr-form/responseError.vm</result>
- <interceptor-ref name="transactionStack"/>
<param name="requiredAuthorities">F_LIST_FORMULA_CHR</param>
- <!-- <result name="success" type="velocity">/dhis-web-chr-form/responseSuccess.vm</result>-->
</action>
<action name="deleteFormReport" class="org.hisp.dhis.vn.chr.formreport.action.DeleteFormReportAction">
=== removed file 'local/vn/dhis-web-chr-form/src/main/resources/webwork.properties'
--- local/vn/dhis-web-chr-form/src/main/resources/webwork.properties 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/resources/webwork.properties 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-
-# Comma separated list of VelocityContext classnames to chain to the WebWorkVelocityContext
-webwork.velocity.contexts = org.hisp.dhis.webwork.encoding.velocity.EncoderVelocityContext
-
-# Set template encoding
-webwork.i18n.encoding = UTF-8
-
-# Use Jakarta (commons-fileupload) as multipart parser
-webwork.multipart.parser = jakarta
-webwork.multipart.maxSize = 1073741824
-
-# Use html, not xhtml
-webwork.ui.theme = html
-
-# Set webwork to use spring
-webwork.objectFactory = spring
-
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/META-INF'
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF'
--- local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/webapp/META-INF/MANIFEST.MF 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/lib'
=== modified file 'local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/web.xml'
--- local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/web.xml 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/webapp/WEB-INF/web.xml 2009-09-01 13:50:25 +0000
@@ -1,12 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; id="WebApp_ID" version="2.5">
- <display-name>dhis-web-chr-form</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
\ No newline at end of file
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app>
+ <display-name>DHIS Web CHR Form</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>automaticAccessType</param-name>
+ <param-value>ghostAdmin</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>RedirectFilter</filter-name>
+ <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
+ <init-param>
+ <param-name>redirectPath</param-name>
+ <param-value>dhis-web-chr-form/index.action</param-value>
+ </init-param>
+ </filter>
+ <filter>
+ <filter-name>OpenSessionInViewFilter</filter-name>
+ <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+ </filter>
+ <filter>
+ <filter-name>SecurityFilterChain</filter-name>
+ <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
+ <init-param>
+ <param-name>targetBean</param-name>
+ <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
+ </init-param>
+ </filter>
+ <filter>
+ <filter-name>Struts</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>RedirectFilter</filter-name>
+ <url-pattern>/</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>OpenSessionInViewFilter</filter-name>
+ <url-pattern>*.action</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>SecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>Struts</filter-name>
+ <url-pattern>*.action</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
+ </listener>
+</web-app>
=== modified file 'local/vn/dhis-web-dataentry-chr/src/main/webapp/WEB-INF/web.xml'
--- local/vn/dhis-web-dataentry-chr/src/main/webapp/WEB-INF/web.xml 2009-09-01 09:07:06 +0000
+++ local/vn/dhis-web-dataentry-chr/src/main/webapp/WEB-INF/web.xml 2009-09-01 13:50:25 +0000
@@ -2,7 +2,7 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>DHIS Data Entry</display-name>
+ <display-name>DHIS Data Entry CHR</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
=== modified file 'local/vn/dhis-web-vn-report/pom.xml'
--- local/vn/dhis-web-vn-report/pom.xml 2009-09-01 10:22:24 +0000
+++ local/vn/dhis-web-vn-report/pom.xml 2009-09-01 13:50:25 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-vn-report</artifactId>
@@ -37,21 +37,14 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-vn</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java 2009-09-01 13:19:47 +0000
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java 2009-09-01 13:50:25 +0000
@@ -112,7 +112,7 @@
for ( UserAuthorityGroup group : credentials.getUserAuthorityGroups() )
{
- reports.addAll( group.getReportExcels() );
+ //reports.addAll( group.getReportExcels() );
}
}
=== modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java'
--- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java 2009-09-01 13:19:47 +0000
+++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java 2009-09-01 13:50:25 +0000
@@ -157,7 +157,7 @@
for ( UserAuthorityGroup group : credentials.getUserAuthorityGroups() )
{
- reports.addAll( group.getReportExcels() );
+ //reports.addAll( group.getReportExcels() );
}
}
=== modified file 'local/vn/dhis-web-vn-report/src/main/resources/struts.xml'
--- local/vn/dhis-web-vn-report/src/main/resources/struts.xml 2009-09-01 13:30:48 +0000
+++ local/vn/dhis-web-vn-report/src/main/resources/struts.xml 2009-09-01 13:50:25 +0000
@@ -101,7 +101,6 @@
<param name="page">/dhis-web-vn-report/reportassociation.vm</param>
<param name="menu">/dhis-web-vn-report/menu.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param>
- <interceptor-ref name="transactionStack" />
<param name="requiredAuthorities">F_UPDATE_REPORT_VN</param>
</action>
@@ -117,7 +116,6 @@
<param name="page">/dhis-web-vn-report/reportassociation.vm</param>
<param name="menu">/dhis-web-vn-report/menu.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param>
- <interceptor-ref name="transactionStack" />
<param name="requiredAuthorities">F_UPDATE_REPORT_VN</param>
</action>
@@ -201,7 +199,6 @@
class="org.hisp.dhis.vn.report.formula.action.GetFilteredDataElementsAction">
<result name="success" type="velocity-xml">
/dhis-web-vn-report/responseOperandList.vm</result>
- <interceptor-ref name="transactionStack" />
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -209,7 +206,6 @@
class="org.hisp.dhis.vn.report.formula.action.GetFormulaTextAction">
<result name="success" type="velocity-xml">
/dhis-web-vn-report/responseFormulaText.vm</result>
- <interceptor-ref name="transactionStack" />
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -372,16 +368,14 @@
<result name="success" type="velocity-xml">/dhis-web-vn-report/categorycombo/responseCategories.vm</result>
<result name="error" type="velocity-xml">/dhis-web-vn-report/categorycombo/responseError.vm</result>
<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/export.js,javascript/dataelement.js,javascript/report.js</param>
- <interceptor-ref name="transactionStack"/>
- </action>
+ </action>
<action name="getDataElementList"
class="org.hisp.dhis.vn.dataelement.action.GetFilteredDataElementListAction">
<result name="success" type="velocity-xml">/dhis-web-vn-report/dataelement/responseDataElements.vm</result>
<result name="error" type="velocity-xml">/dhis-web-vn-report/dataelement/responseError.vm</result>
<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/export.js,javascript/dataelement.js,javascript/report.js</param>
- <interceptor-ref name="transactionStack"/>
- </action>
+ </action>
<action name="validateAddDataElementAndCateCombo"
class="org.hisp.dhis.vn.dataelement.action.ValidateAddDataElementAndCateComboInCategoryReportAction">
@@ -407,7 +401,6 @@
<action name="openSelectedElementsAndAvailableElementsChain"
class="org.hisp.dhis.vn.dataelement.action.GetDataElementGroupMembersAction">
<result name="success" type="velocity-xml">/dhis-web-vn-report/responseReport.vm</result>
- <interceptor-ref name="transactionStack"/>
</action>
@@ -423,7 +416,5 @@
<param name="javascripts">javascript/export.js,javascript/dataelement.js,javascript/report.js</param>
</action>
-
-
</package>
</struts>
=== modified file 'local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml'
--- local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml 2009-09-01 13:30:48 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml 2009-09-01 13:50:25 +0000
@@ -23,11 +23,7 @@
</filter>
<filter>
<filter-name>OpenSessionInViewFilter</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- <init-param>
- <param-name>targetBeanName</param-name>
- <param-value>org.hisp.dhis.servlet.filter.OpenSessionInViewFilter</param-value>
- </init-param>
+ <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
</filter>
<filter>
<filter-name>SecurityFilterChain</filter-name>
