dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01606
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 490: Upgrade to Struts for dhis-web-mapping.
------------------------------------------------------------
revno: 490
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-08-21 10:34:37 +0200
message:
Upgrade to Struts for dhis-web-mapping.
renamed:
gis/dhis-web-mapping/src/main/resources/xwork.xml => gis/dhis-web-mapping/src/main/resources/struts.xml
modified:
gis/dhis-web-mapping/pom.xml
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLayerAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendSetAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLayerAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLegendSetAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsByMapAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapViewAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorGroupsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLayersAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendSetsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapViewsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllPeriodTypesAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAvailableMapOrganisationUnitRelationsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorsByIndicatorGroupAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapByMapLayerPathAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendSetAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitLevelsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsAtLevelAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithPolygonsAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java
gis/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml
gis/dhis-web-mapping/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 'gis/dhis-web-mapping/pom.xml'
--- gis/dhis-web-mapping/pom.xml 2009-08-20 18:52:55 +0000
+++ gis/dhis-web-mapping/pom.xml 2009-08-21 08:34:37 +0000
@@ -59,10 +59,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
</dependency>
<dependency>
@@ -70,10 +66,6 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-webwork</artifactId>
- </dependency>
<!-- Mapfish print module -->
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java 2009-06-17 22:06:54 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java 2009-08-21 08:34:37 +0000
@@ -36,7 +36,7 @@
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java 2009-04-28 14:23:39 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapAction.java 2009-08-21 08:34:37 +0000
@@ -29,7 +29,7 @@
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLayerAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLayerAction.java 2009-08-20 18:52:55 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLayerAction.java 2009-08-21 08:34:37 +0000
@@ -29,7 +29,7 @@
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendSetAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendSetAction.java 2009-05-29 13:26:20 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapLegendSetAction.java 2009-08-21 08:34:37 +0000
@@ -32,7 +32,7 @@
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationAction.java 2009-04-21 12:56:39 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapOrganisationUnitRelationAction.java 2009-08-21 08:34:37 +0000
@@ -29,7 +29,7 @@
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java 2009-07-13 20:00:15 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java 2009-08-21 08:34:37 +0000
@@ -29,7 +29,7 @@
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapAction.java 2009-04-21 11:38:54 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Oeverland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLayerAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLayerAction.java 2009-08-20 18:52:55 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLayerAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.MapLayer;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLegendSetAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLegendSetAction.java 2009-04-21 16:52:52 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapLegendSetAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationAction.java 2009-04-24 10:20:52 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsByMapAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsByMapAction.java 2009-04-24 10:27:56 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapOrganisationUnitRelationsByMapAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapViewAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapViewAction.java 2009-05-27 10:26:48 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/DeleteMapViewAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.MapView;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorGroupsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorGroupsAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorGroupsAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorsAction.java 2009-05-27 10:26:48 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllIndicatorsAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLayersAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLayersAction.java 2009-08-20 18:52:55 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLayersAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.mapping.MapLayer;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendSetsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendSetsAction.java 2009-04-22 16:10:50 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapLegendSetsAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapViewsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapViewsAction.java 2009-05-27 10:26:48 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapViewsAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.mapping.MapView;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapsAction.java 2009-07-13 11:45:16 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllMapsAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllPeriodTypesAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllPeriodTypesAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllPeriodTypesAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.period.PeriodStore;
import org.hisp.dhis.period.PeriodType;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAvailableMapOrganisationUnitRelationsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAvailableMapOrganisationUnitRelationsAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAvailableMapOrganisationUnitRelationsAction.java 2009-08-21 08:34:37 +0000
@@ -32,7 +32,7 @@
import org.hisp.dhis.mapping.MapOrganisationUnitRelation;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorsByIndicatorGroupAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorsByIndicatorGroupAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetIndicatorsByIndicatorGroupAction.java 2009-08-21 08:34:37 +0000
@@ -34,7 +34,7 @@
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapByMapLayerPathAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapByMapLayerPathAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapByMapLayerPathAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendSetAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendSetAction.java 2009-04-22 20:33:21 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapLegendSetAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java 2009-07-13 20:00:15 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java 2009-08-21 08:34:37 +0000
@@ -5,7 +5,7 @@
import org.hisp.dhis.user.UserSettingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetMapSourceTypeUserSettingAction
implements Action
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesAction.java 2009-08-21 08:34:37 +0000
@@ -32,7 +32,7 @@
import org.hisp.dhis.aggregation.AggregatedMapValue;
import org.hisp.dhis.datamart.DataMartStore;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java 2009-06-08 15:45:19 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapViewAction.java 2009-08-21 08:34:37 +0000
@@ -30,7 +30,7 @@
import org.hisp.dhis.mapping.MapView;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java 2009-05-11 12:56:56 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java 2009-08-21 08:34:37 +0000
@@ -5,7 +5,7 @@
import org.hisp.dhis.mapping.Map;
import org.hisp.dhis.mapping.MappingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class GetMapsByTypeAction
implements Action
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitLevelsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitLevelsAction.java 2009-04-16 10:14:30 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitLevelsAction.java 2009-08-21 08:34:37 +0000
@@ -32,7 +32,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsAtLevelAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsAtLevelAction.java 2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsAtLevelAction.java 2009-08-21 08:34:37 +0000
@@ -33,7 +33,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java 2009-06-16 14:40:57 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java 2009-08-21 08:34:37 +0000
@@ -35,7 +35,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithPolygonsAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithPolygonsAction.java 2009-06-25 11:26:03 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithPolygonsAction.java 2009-08-21 08:34:37 +0000
@@ -35,7 +35,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Jan Henrik Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java 2009-06-08 15:45:19 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java 2009-08-21 08:34:37 +0000
@@ -37,7 +37,7 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.period.comparator.PeriodComparator;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java 2009-04-16 10:14:30 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java 2009-08-21 08:34:37 +0000
@@ -27,7 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* @author Lars Helge Overland
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java 2009-07-13 20:00:15 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java 2009-08-21 08:34:37 +0000
@@ -4,7 +4,7 @@
import org.hisp.dhis.user.UserSettingService;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class SetMapSourceTypeUserSettingAction
implements Action
=== renamed file 'gis/dhis-web-mapping/src/main/resources/xwork.xml' => 'gis/dhis-web-mapping/src/main/resources/struts.xml'
--- gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-08-20 18:53:51 +0000
+++ gis/dhis-web-mapping/src/main/resources/struts.xml 2009-08-21 08:34:37 +0000
@@ -1,7 +1,9 @@
<?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-mapping" extends="dhis-web-commons"
@@ -168,4 +170,4 @@
</action>
</package>
-</xwork>
+</struts>
=== modified file 'gis/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml'
--- gis/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml 2009-08-20 18:53:51 +0000
+++ gis/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml 2009-08-21 08:34:37 +0000
@@ -34,8 +34,8 @@
</init-param>
</filter>
<filter>
- <filter-name>WebWork</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ <filter-name>Struts</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
</filter>
<filter-mapping>
@@ -51,7 +51,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>WebWork</filter-name>
+ <filter-name>Struts</filter-name>
<url-pattern>*.action</url-pattern>
</filter-mapping>
