dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01726
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 533: Upgraded dhis-web-chr-form to Struts2.
------------------------------------------------------------
revno: 533
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-09-01 07:24:32 +0200
message:
Upgraded dhis-web-chr-form to Struts2.
renamed:
local/vn/dhis-web-chr-form/src/main/resources/xwork.xml => local/vn/dhis-web-chr-form/src/main/resources/struts.xml
modified:
local/vn/dhis-web-chr-form/pom.xml
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/GetFormConfigurationAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/SetImageDirectoryOnServerAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/GetEgroupById.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/ListEgroupAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/GetElementById.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/ListElementAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ActionSupport.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetElementsForGroupAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormById.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormByName.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormsByName.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetInformationForSystemAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetVisibleFormsAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ListFormAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/AddObjectFormAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListObjectAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListRelativeObjectAction.java
local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/UploadFileAction.java
local/vn/dhis-web-chr-form/src/main/resources/META-INF/dhis/beans.xml
local/vn/dhis-web-chr-form/src/main/resources/struts.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-web-chr-form/pom.xml'
--- local/vn/dhis-web-chr-form/pom.xml 2009-09-01 04:30:55 +0000
+++ local/vn/dhis-web-chr-form/pom.xml 2009-09-01 05:24:32 +0000
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-chr</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -61,14 +61,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-useradminandsecurity</artifactId>
</dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
@@ -81,18 +74,17 @@
</dependency>
<!-- Upload file -->
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2</version>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
- </dependency>
-
+ </dependency>
</dependencies>
</project>
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/GetFormConfigurationAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/GetFormConfigurationAction.java 2009-09-01 05:11:45 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/GetFormConfigurationAction.java 2009-09-01 05:24:32 +0000
@@ -7,7 +7,7 @@
import org.hisp.dhis.options.SystemSettingManager;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetFormConfigurationAction
implements Action
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/SetImageDirectoryOnServerAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/SetImageDirectoryOnServerAction.java 2009-09-01 05:11:45 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/configuration/action/SetImageDirectoryOnServerAction.java 2009-09-01 05:24:32 +0000
@@ -9,7 +9,8 @@
import org.hisp.dhis.vn.chr.form.action.ActionSupport;
public class SetImageDirectoryOnServerAction
- extends ActionSupport{
+ extends ActionSupport
+{
// -------------------------------------------------------------------------
// Dependencies
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/GetEgroupById.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/GetEgroupById.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/GetEgroupById.java 2009-09-01 05:24:32 +0000
@@ -7,7 +7,7 @@
import org.hisp.dhis.vn.chr.Egroup;
import org.hisp.dhis.vn.chr.EgroupService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetEgroupById implements Action{
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/ListEgroupAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/ListEgroupAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/egroup/action/ListEgroupAction.java 2009-09-01 05:24:32 +0000
@@ -5,7 +5,7 @@
import org.hisp.dhis.vn.chr.Egroup;
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class ListEgroupAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/GetElementById.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/GetElementById.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/GetElementById.java 2009-09-01 05:24:32 +0000
@@ -7,7 +7,7 @@
import org.hisp.dhis.vn.chr.Element;
import org.hisp.dhis.vn.chr.ElementService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetElementById implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/ListElementAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/ListElementAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/element/action/ListElementAction.java 2009-09-01 05:24:32 +0000
@@ -10,7 +10,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class ListElementAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ActionSupport.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ActionSupport.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ActionSupport.java 2009-09-01 05:24:32 +0000
@@ -29,7 +29,7 @@
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.i18n.I18nFormat;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Tran Thanh Tri
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetElementsForGroupAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetElementsForGroupAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetElementsForGroupAction.java 2009-09-01 05:24:32 +0000
@@ -12,7 +12,7 @@
import org.hisp.dhis.vn.chr.Element;
import org.hisp.dhis.vn.chr.Form;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetElementsForGroupAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormById.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormById.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormById.java 2009-09-01 05:24:32 +0000
@@ -7,7 +7,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetFormById implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormByName.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormByName.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormByName.java 2009-09-01 05:24:32 +0000
@@ -8,7 +8,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetFormByName implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormsByName.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormsByName.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetFormsByName.java 2009-09-01 05:24:32 +0000
@@ -10,7 +10,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetFormsByName implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetInformationForSystemAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetInformationForSystemAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetInformationForSystemAction.java 2009-09-01 05:24:32 +0000
@@ -10,7 +10,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.statement.FormStatement;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetInformationForSystemAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetVisibleFormsAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetVisibleFormsAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/GetVisibleFormsAction.java 2009-09-01 05:24:32 +0000
@@ -7,7 +7,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetVisibleFormsAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ListFormAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ListFormAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/form/action/ListFormAction.java 2009-09-01 05:24:32 +0000
@@ -13,7 +13,7 @@
import org.hisp.dhis.vn.chr.FormService;
import org.hisp.dhis.vn.chr.comparator.FormNameComparator;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class ListFormAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/AddObjectFormAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/AddObjectFormAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/AddObjectFormAction.java 2009-09-01 05:24:32 +0000
@@ -14,7 +14,7 @@
import org.hisp.dhis.vn.chr.FormService;
import org.hisp.dhis.vn.chr.jdbc.FormManager;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class AddObjectFormAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListObjectAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListObjectAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListObjectAction.java 2009-09-01 05:24:32 +0000
@@ -13,7 +13,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
import org.hisp.dhis.vn.chr.jdbc.FormManager;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class ListObjectAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListRelativeObjectAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListRelativeObjectAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListRelativeObjectAction.java 2009-09-01 05:24:32 +0000
@@ -15,7 +15,7 @@
import org.hisp.dhis.vn.chr.Form;
import org.hisp.dhis.vn.chr.FormService;
import org.hisp.dhis.vn.chr.jdbc.FormManager;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class ListRelativeObjectAction implements Action {
=== modified file 'local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/UploadFileAction.java'
--- local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/UploadFileAction.java 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/UploadFileAction.java 2009-09-01 05:24:32 +0000
@@ -10,119 +10,136 @@
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.hisp.dhis.options.formconfiguration.FormConfigurationManager;
-import com.opensymphony.xwork.Action;
-
-public class UploadFileAction implements Action {
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private FormConfigurationManager formConfigurationManager;
-
- // -----------------------------------------------------------------------------------------------
- // Input && Output
- // -----------------------------------------------------------------------------------------------
-
- private List files = new ArrayList();
-
- private File uploadFile;
-
- private String uploadFilename;
-
- private String contentType;
-
- private String imageDirectoryOnServer;
-
- // -----------------------------------------------------------------------------------------------
- // Getters && Setters
- // -----------------------------------------------------------------------------------------------
-
- public void setFormConfigurationManager(
- FormConfigurationManager formConfigurationManager) {
- this.formConfigurationManager = formConfigurationManager;
- }
-
- public void setFiles(List files) {
- this.files = files;
- }
-
- public List getFiles() {
- return files;
- }
-
- public File getUploadFile() {
- return uploadFile;
- }
-
- public void setUploadFile(File uploadFile) {
- this.uploadFile = uploadFile;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public String getUploadFilename() {
- return uploadFilename;
- }
-
- public void setUploadFilename(String uploadFilename) {
- this.uploadFilename = uploadFilename;
- }
-
- // -----------------------------------------------------------------------------------------------
- // Implements
- // -----------------------------------------------------------------------------------------------
-
- public String execute() {
- FileInputStream fin = null;
- FileOutputStream fout = null;
-
- String imageDirectoryOnServer = formConfigurationManager
- .getImageDirectoryOnServer();
-
- try {
-
- if (uploadFile != null) {
- fin = new FileInputStream(uploadFile);// (doc.getPath());
- byte[] data = new byte[8192];
- int byteReads = fin.read(data);
-
- fout = new FileOutputStream(imageDirectoryOnServer + "/"
- + uploadFilename);
-
- while (byteReads != -1) {
- fout.write(data, 0, byteReads);
- fout.flush();
- byteReads = fin.read(data);
- }
- fin.close();
- fout.close();
- }
-
- // Load files in the directory on server
- File myDir = new File(imageDirectoryOnServer);
- if (myDir.exists() && myDir.isDirectory()) {
- File[] listfiles = myDir.listFiles();
- for (int i = 0; i < listfiles.length; i++) {
- if (!listfiles[i].isDirectory() && !listfiles[i].isHidden())
- files.add(listfiles[i]);
- }
- }
-
- return SUCCESS;
-
- } catch (Exception ex) {
- ex.printStackTrace();
- return ERROR;
- }
-
- }
+
+import org.hisp.dhis.options.SystemSettingManager;
+
+import com.opensymphony.xwork2.Action;
+
+public class UploadFileAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private SystemSettingManager systemSettingManager;
+
+ public void setSystemSettingManager( SystemSettingManager systemSettingManager )
+ {
+ this.systemSettingManager = systemSettingManager;
+ }
+
+ // -----------------------------------------------------------------------------------------------
+ // Input && Output
+ // -----------------------------------------------------------------------------------------------
+
+ private List files = new ArrayList();
+
+ private File uploadFile;
+
+ private String uploadFilename;
+
+ private String contentType;
+
+ private String imageDirectoryOnServer;
+
+ // -----------------------------------------------------------------------------------------------
+ // Getters && Setters
+ // -----------------------------------------------------------------------------------------------
+
+ public void setFiles( List files )
+ {
+ this.files = files;
+ }
+
+ public List getFiles()
+ {
+ return files;
+ }
+
+ public File getUploadFile()
+ {
+ return uploadFile;
+ }
+
+ public void setUploadFile( File uploadFile )
+ {
+ this.uploadFile = uploadFile;
+ }
+
+ public String getContentType()
+ {
+ return contentType;
+ }
+
+ public void setContentType( String contentType )
+ {
+ this.contentType = contentType;
+ }
+
+ public String getUploadFilename()
+ {
+ return uploadFilename;
+ }
+
+ public void setUploadFilename( String uploadFilename )
+ {
+ this.uploadFilename = uploadFilename;
+ }
+
+ // -----------------------------------------------------------------------------------------------
+ // Implements
+ // -----------------------------------------------------------------------------------------------
+
+ public String execute()
+ {
+ FileInputStream fin = null;
+ FileOutputStream fout = null;
+
+ String imageDirectoryOnServer = (String) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_CHR_IMAGE_DIRECTORY );
+
+ try
+ {
+
+ if ( uploadFile != null )
+ {
+ fin = new FileInputStream( uploadFile );// (doc.getPath());
+ byte[] data = new byte[8192];
+ int byteReads = fin.read( data );
+
+ fout = new FileOutputStream( imageDirectoryOnServer + "/" + uploadFilename );
+
+ while ( byteReads != -1 )
+ {
+ fout.write( data, 0, byteReads );
+ fout.flush();
+ byteReads = fin.read( data );
+ }
+ fin.close();
+ fout.close();
+ }
+
+ // Load files in the directory on server
+ File myDir = new File( imageDirectoryOnServer );
+ if ( myDir.exists() && myDir.isDirectory() )
+ {
+ File[] listfiles = myDir.listFiles();
+ for ( int i = 0; i < listfiles.length; i++ )
+ {
+ if ( !listfiles[i].isDirectory() && !listfiles[i].isHidden() )
+ files.add( listfiles[i] );
+ }
+ }
+
+ return SUCCESS;
+
+ }
+ catch ( Exception ex )
+ {
+ ex.printStackTrace();
+ return ERROR;
+ }
+
+ }
}
\ No newline at end of file
=== modified file 'local/vn/dhis-web-chr-form/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-chr-form/src/main/resources/META-INF/dhis/beans.xml 2009-09-01 05:11:45 +0000
+++ local/vn/dhis-web-chr-form/src/main/resources/META-INF/dhis/beans.xml 2009-09-01 05:24:32 +0000
@@ -277,8 +277,8 @@
<!-- - Upload file -->
<bean id='org.hisp.dhis.vn.chr.object.action.UploadFileAction'
class='org.hisp.dhis.vn.chr.object.action.UploadFileAction' scope="prototype">
- <property name="formConfigurationManager"
- ref="org.hisp.dhis.options.formconfiguration.FormConfigurationManager" />
+ <property name="systemSettingManager"
+ ref="org.hisp.dhis.options.SystemSettingManager" />
<!--
<property name="locationManager"
ref="org.hisp.dhis.external.location.LocationManager"/>
=== renamed file 'local/vn/dhis-web-chr-form/src/main/resources/xwork.xml' => 'local/vn/dhis-web-chr-form/src/main/resources/struts.xml'
--- local/vn/dhis-web-chr-form/src/main/resources/xwork.xml 2009-09-01 03:49:33 +0000
+++ local/vn/dhis-web-chr-form/src/main/resources/struts.xml 2009-09-01 05:24:32 +0000
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
- "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
<include file="dhis-web-commons.xml" />
<package name="dhis-web-chr-form" extends="dhis-web-commons"
@@ -377,4 +378,4 @@
</action>
</package>
-</xwork>
+</struts>
