dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11156
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3143: Removed unused module
------------------------------------------------------------
revno: 3143
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-03-23 20:25:36 +0100
message:
Removed unused module
removed:
webservice/
webservice/dhis-webservice-expoze/
webservice/dhis-webservice-expoze/pom.xml
webservice/dhis-webservice-expoze/src/
webservice/dhis-webservice-expoze/src/main/
webservice/dhis-webservice-expoze/src/main/java/
webservice/dhis-webservice-expoze/src/main/java/org/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/DefaultIndicatorServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/IndicatorServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/DefaultMappingServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/MappingServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/DefaultOrganisationUnitServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/OrganisationUnitServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/DefaultPeriodServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/PeriodServiceAdapter.java
webservice/dhis-webservice-expoze/src/main/resources/
webservice/dhis-webservice-expoze/src/main/resources/META-INF/
webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis/
webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis/beans.xml
webservice/dhis-webservice-expoze/src/main/resources/cssHtmlDataCompleteness.vm
webservice/dhis-webservice-expoze/src/main/resources/cssHtmlReportTableData.vm
webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml
webservice/dhis-webservice-expoze/src/main/resources/htmlDataCompleteness.vm
webservice/dhis-webservice-expoze/src/main/resources/htmlReportTableData.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedDataValues.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedIndicatorValues.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedMapValues.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonCharts.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonDataElement.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonDataElements.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonDataSet.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonDataSets.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonIndicator.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonIndicatorGroups.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonIndicators.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonLegendMinMax.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonMap.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonMapOrganisationUnitRelations.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonMaps.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnit.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnitLevels.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnits.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonPeriodTypes.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonPeriods.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonPivotTable.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonReportTable.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonReportTables.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonminDataElements.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonminIndicators.vm
webservice/dhis-webservice-expoze/src/main/resources/jsonminMaps.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedDataValues.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedIndicatorValues.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedMapValues.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlCharts.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlDataCompleteness.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlDataElement.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlDataElements.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlDataSet.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlDataSets.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlIndicator.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlIndicatorGroups.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlIndicators.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlLegendMinMax.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlMap.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlMapOrganisationUnitRelations.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlMaps.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnit.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnitLevels.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnits.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlPeriodTypes.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlPeriods.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlReportTable.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlReportTableData.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlReportTables.vm
webservice/dhis-webservice-expoze/src/main/resources/xmlcompOrganisationUnits.vm
webservice/dhis-webservice-expoze/src/main/webapp/
webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF/
webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF/web.xml
webservice/dhis-webservice-expoze/src/main/webapp/css/
webservice/dhis-webservice-expoze/src/main/webapp/css/stylesheet.css
webservice/dhis-webservice-expoze/src/main/webapp/images/
webservice/dhis-webservice-expoze/src/main/webapp/images/head.png
webservice/dhis-webservice-expoze/src/main/webapp/index.html
--
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
=== removed directory 'webservice'
=== removed directory 'webservice/dhis-webservice-expoze'
=== removed file 'webservice/dhis-webservice-expoze/pom.xml'
--- webservice/dhis-webservice-expoze/pom.xml 2010-08-20 09:13:09 +0000
+++ webservice/dhis-webservice-expoze/pom.xml 1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web</artifactId>
- <version>2.0.6-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-webservice-expoze</artifactId>
- <packaging>war</packaging>
- <name>DHIS WebService</name>
-
- <build>
- <finalName>dhis-webservice</finalName>
- </build>
-
- <dependencies>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-datamart-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-mapping</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.amplecode</groupId>
- <artifactId>expoze</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- </dependencies>
-
-</project>
=== removed directory 'webservice/dhis-webservice-expoze/src'
=== removed directory 'webservice/dhis-webservice-expoze/src/main'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator'
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/DefaultIndicatorServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/DefaultIndicatorServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/DefaultIndicatorServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-package org.hisp.dhis.webservice.adapter.indicator;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public class DefaultIndicatorServiceAdapter
- implements IndicatorServiceAdapter
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // IndicatorServiceAdapter implementation
- // -------------------------------------------------------------------------
-
- public Collection<Indicator> getIndicatorsByIndicatorGroup( int indicatorGroupId )
- {
- IndicatorGroup indicatorGroup = indicatorService.getIndicatorGroup( indicatorGroupId );
-
- return indicatorGroup != null ? indicatorGroup.getMembers() : null;
- }
-}
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/IndicatorServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/IndicatorServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/IndicatorServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-package org.hisp.dhis.webservice.adapter.indicator;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.indicator.Indicator;
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public interface IndicatorServiceAdapter
-{
- Collection<Indicator> getIndicatorsByIndicatorGroup( int indicatorGroupId );
-}
\ No newline at end of file
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping'
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/DefaultMappingServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/DefaultMappingServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/DefaultMappingServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-package org.hisp.dhis.webservice.adapter.mapping;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-import java.util.Set;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.mapping.Map;
-import org.hisp.dhis.mapping.MapOrganisationUnitRelation;
-import org.hisp.dhis.mapping.MappingService;
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public class DefaultMappingServiceAdapter
- implements MappingServiceAdapter
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private MappingService mappingService;
-
- public void setMappingService( MappingService mappingService )
- {
- this.mappingService = mappingService;
- }
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- // -------------------------------------------------------------------------
- // Map
- // -------------------------------------------------------------------------
-
- public int addMap( String name, String mapLayerPath, String type, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
- String nameColumn, String longitude, String latitude, int zoom )
- {
- OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
- OrganisationUnitLevel organisationUnitLevel = organisationUnitService
- .getOrganisationUnitLevel( organisationUnitLevelId );
-
- Set<String> staticMapLayerPaths = null;
-
- Map map = new Map( name, mapLayerPath, type, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
- latitude, zoom, staticMapLayerPaths );
-
- return mappingService.addMap( map );
- }
-
- public void addOrUpdateMap( String name, String mapLayerPath, String type, int organisationUnitId, int organisationUnitLevelId,
- String uniqueColumn, String nameColumn, String longitude, String latitude, int zoom )
- {
- Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
-
- OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
- OrganisationUnitLevel organisationUnitLevel = organisationUnitService
- .getOrganisationUnitLevel( organisationUnitLevelId );
-
- Set<String> staticMapLayerPaths = null;
-
- if ( map != null )
- {
- map.setOrganisationUnit( organisationUnit );
- map.setOrganisationUnitLevel( organisationUnitLevel );
- map.setUniqueColumn( uniqueColumn );
- map.setNameColumn( nameColumn );
- map.setLongitude( longitude );
- map.setLatitude( latitude );
- map.setZoom( zoom );
-
- mappingService.updateMap( map );
- }
- else
- {
- map = new Map( name, mapLayerPath, type, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
- latitude, zoom, staticMapLayerPaths );
-
- mappingService.addMap( map );
- }
- }
-
- public void deleteMapByMapLayerPath( String mapLayerPath )
- {
- Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
-
- mappingService.deleteMap( map );
- }
-
- // -------------------------------------------------------------------------
- // MapOrganisationUnitRelation
- // -------------------------------------------------------------------------
-
- public int addMapOrganisationUnitRelation( String mapLayerPath, int organisationUnitId, String featureId )
- {
- Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
-
- OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
- MapOrganisationUnitRelation mapOrganisationUnitRelation = new MapOrganisationUnitRelation( map,
- organisationUnit, featureId );
-
- return mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelation );
- }
-
- public void addOrUpdateMapOrganisationUnitRelation( String mapLayerPath, int organisationUnitId, String featureId )
- {
- Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
-
- OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
- MapOrganisationUnitRelation mapOrganisationUnitRelation = mappingService.getMapOrganisationUnitRelation( map,
- organisationUnit );
-
- if ( mapOrganisationUnitRelation != null )
- {
- mapOrganisationUnitRelation.setFeatureId( featureId );
-
- mappingService.updateMapOrganisationUnitRelation( mapOrganisationUnitRelation );
- }
- else
- {
- mapOrganisationUnitRelation = new MapOrganisationUnitRelation( map, organisationUnit, featureId );
-
- mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelation );
- }
- }
-
- public Collection<MapOrganisationUnitRelation> getAvailableMapOrganisationUnitRelations( String mapLayerPath )
- {
- Map map = mappingService.getMapByMapLayerPath( mapLayerPath );
-
- return mappingService.getAvailableMapOrganisationUnitRelations( map );
- }
-}
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/MappingServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/MappingServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/MappingServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-package org.hisp.dhis.webservice.adapter.mapping;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.mapping.MapOrganisationUnitRelation;
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public interface MappingServiceAdapter
-{
- // -------------------------------------------------------------------------
- // Map
- // -------------------------------------------------------------------------
-
- int addMap( String name, String mapLayerPath, String type, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
- String nameColumn, String longitude, String latitude, int zoom );
-
- void addOrUpdateMap( String name, String mapLayerPath, String type, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
- String nameColumn, String longitude, String latitude, int zoom );
-
- void deleteMapByMapLayerPath( String mapLayerPath );
-
- // -------------------------------------------------------------------------
- // MapOrganisationUnitRelation
- // -------------------------------------------------------------------------
-
- int addMapOrganisationUnitRelation( String mapLayerPath, int organisationUnitId, String featureId );
-
- void addOrUpdateMapOrganisationUnitRelation( String mapLayerPath, int organisationUnitId, String featureId );
-
- Collection<MapOrganisationUnitRelation> getAvailableMapOrganisationUnitRelations( String mapLayerPath );
-}
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit'
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/DefaultOrganisationUnitServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/DefaultOrganisationUnitServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/DefaultOrganisationUnitServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-package org.hisp.dhis.webservice.adapter.organisationunit;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public class DefaultOrganisationUnitServiceAdapter
- implements OrganisationUnitServiceAdapter
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- // -------------------------------------------------------------------------
- // PeriodServiceAdapter implementation
- // -------------------------------------------------------------------------
-
- public void updateOrganisationUnitGeoCode( int id, String geoCode )
- {
- OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( id );
-
- if ( organisationUnit != null )
- {
- organisationUnit.setGeoCode( geoCode );
-
- organisationUnitService.updateOrganisationUnit( organisationUnit );
- }
- }
-}
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/OrganisationUnitServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/OrganisationUnitServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/OrganisationUnitServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-package org.hisp.dhis.webservice.adapter.organisationunit;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @author Jan Henrik Overland
- * @version $Id$
- */
-public interface OrganisationUnitServiceAdapter
-{
- void updateOrganisationUnitGeoCode( int id, String geoCode );
-}
=== removed directory 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period'
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/DefaultPeriodServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/DefaultPeriodServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/DefaultPeriodServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-package org.hisp.dhis.webservice.adapter.period;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.PeriodType;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DefaultPeriodServiceAdapter
- implements PeriodServiceAdapter
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private PeriodService periodService;
-
- public void setPeriodService( PeriodService periodService )
- {
- this.periodService = periodService;
- }
-
- // -------------------------------------------------------------------------
- // PeriodServiceAdapter implementation
- // -------------------------------------------------------------------------
-
- public Collection<Period> getPeriodsByPeriodType( int periodTypeId )
- {
- PeriodType periodType = periodService.getPeriodType( periodTypeId );
-
- return periodService.getPeriodsByPeriodType( periodType );
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/PeriodServiceAdapter.java'
--- webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/PeriodServiceAdapter.java 2010-04-12 21:23:33 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/period/PeriodServiceAdapter.java 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-package org.hisp.dhis.webservice.adapter.period;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.period.Period;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface PeriodServiceAdapter
-{
- Collection<Period> getPeriodsByPeriodType( int periodTypeId );
-}
=== removed directory 'webservice/dhis-webservice-expoze/src/main/resources'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/resources/META-INF'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis'
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis/beans.xml'
--- webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis/beans.xml 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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";>
-
- <bean id="org.hisp.dhis.webservice.adapter.period.PeriodServiceAdapter"
- class="org.hisp.dhis.webservice.adapter.period.DefaultPeriodServiceAdapter">
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
- </bean>
-
- <bean id="org.hisp.dhis.webservice.adapter.indicator.IndicatorServiceAdapter"
- class="org.hisp.dhis.webservice.adapter.indicator.DefaultIndicatorServiceAdapter">
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService"/>
- </bean>
-
- <bean id="org.hisp.dhis.webservice.adapter.organisationunit.OrganisationUnitServiceAdapter"
- class="org.hisp.dhis.webservice.adapter.organisationunit.DefaultOrganisationUnitServiceAdapter">
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </bean>
-
- <bean id="org.hisp.dhis.webservice.adapter.mapping.MappingServiceAdapter"
- class="org.hisp.dhis.webservice.adapter.mapping.DefaultMappingServiceAdapter">
- <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService"/>
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </bean>
-
-</beans>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/cssHtmlDataCompleteness.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/cssHtmlDataCompleteness.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/cssHtmlDataCompleteness.vm 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-
-#macro( alternate $mark )
- #if( $mark ) class="listAlternateRow"#else class="listRow"#end
-#end
-
-<html>
- <head>
- <link type="text/css" rel="stylesheet" href="css/stylesheet.css">
- </head>
- <body>
- <table class="listTable">
- <tr>
- <th>Name</th>
- <th>Actual</th>
- <th>Target</th>
- <th>Percentage</th>
- <th>On time</th>
- <th>Percentage</th>
- </tr>
- #set( $mark = false )
- #foreach( $result in $object )
- <tr>
- <td#alternate( $mark )>$result.name</td>
- <td#alternate( $mark )>$result.sources</td>
- <td#alternate( $mark )>$result.registrations</td>
- <td#alternate( $mark )>$result.getPercentage()</td>
- <td#alternate( $mark )>$result.registrationsOnTime</td>
- <td#alternate( $mark )>$result.getPercentageOnTime()</td>
- </tr>
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- #end
- </table>
- </body>
-</html>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/cssHtmlReportTableData.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/cssHtmlReportTableData.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/cssHtmlReportTableData.vm 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-
-#macro( alternate $mark )
- #if( $mark ) class="listAlternateRow"#else class="listRow"#end
-#end
-
-<html>
- <head>
- <link type="text/css" rel="stylesheet" href="css/stylesheet.css">
- </head>
- <body>
- <table class="listTable">
- <tr>
- <td style="text-align:center" colspan="$object.columns.values().size()"><h3>$object.name</h3></td>
- </tr>
- <tr>
- #foreach( $column in $object.columns.values() )
- <th>$column</th>
- #end
- </tr>
- #set( $mark = false )
- #foreach( $row in $object.rows )
- <tr>
- #foreach( $value in $row.values() )
- <td#alternate( $mark )>$value</td>
- #end
- </tr>
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- #end
- </table>
- </body>
-</html>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml'
--- webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml 2009-06-23 09:17:22 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml 1970-01-01 00:00:00 +0000
@@ -1,1127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<expoze xmlns="http://www.amplecode.org/schema/expoze";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.amplecode.org/schema/expoze expoze-1.0.xsd">
-
- <requests>
-
- <!-- DataElement -->
-
- <request>
- <name>getAllDataElements</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getAllDataElements</method>
- <template>xmlDataElements.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElements.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>jsonmin</format>
- <template>jsonminDataElements.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>pdf</format>
- <type>file</type>
- <bean>org.hisp.dhis.pdf.PdfService</bean>
- <method>writeAllDataElements</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/pdf</contentType>
- </response>
- <response>
- <format>xls</format>
- <type>file</type>
- <bean>org.hisp.dhis.workbook.WorkbookService</bean>
- <method>writeAllDataElements</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/vnd.ms-excel</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataElement</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getDataElement</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlDataElement.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElement.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataElementByName</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getDataElementByName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>name</name>
- </parameter>
- </parameters>
- <template>xmlDataElement.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElement.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataElementByAlternativeName</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getDataElementByAlternativeName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>alternativeName</name>
- </parameter>
- </parameters>
- <template>xmlDataElement.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElement.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataElementByShortName</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getDataElementByShortName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>shortName</name>
- </parameter>
- </parameters>
- <template>xmlDataElement.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElement.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataElementByCode</name>
- <bean>org.hisp.dhis.dataelement.DataElementService</bean>
- <method>getDataElementByCode</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>code</name>
- </parameter>
- </parameters>
- <template>xmlDataElement.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataElement.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- Indicator -->
-
- <request>
- <name>getAllIndicators</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getAllIndicators</method>
- <template>xmlIndicators.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicators.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>jsonmin</format>
- <template>jsonminIndicators.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>pdf</format>
- <type>file</type>
- <bean>org.hisp.dhis.pdf.PdfService</bean>
- <method>writeAllIndicators</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/pdf</contentType>
- </response>
- <response>
- <format>xls</format>
- <type>file</type>
- <bean>org.hisp.dhis.workbook.WorkbookService</bean>
- <method>writeAllIndicators</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/vnd.ms-excel</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicator</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getIndicator</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlIndicator.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicator.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicatorByName</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getIndicatorByName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>name</name>
- </parameter>
- </parameters>
- <template>xmlIndicator.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicator.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicatorByAlternativeName</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getIndicatorByAlternativeName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>alternativeName</name>
- </parameter>
- </parameters>
- <template>xmlIndicator.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicator.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicatorByShortName</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getIndicatorByShortName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>shortName</name>
- </parameter>
- </parameters>
- <template>xmlIndicator.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicator.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicatorByCode</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getIndicatorByCode</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>code</name>
- </parameter>
- </parameters>
- <template>xmlIndicator.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicator.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getIndicatorsByIndicatorGroup</name>
- <bean>org.hisp.dhis.webservice.adapter.indicator.IndicatorServiceAdapter</bean>
- <method>getIndicatorsByIndicatorGroup</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>indicatorGroupId</name>
- </parameter>
- </parameters>
- <template>xmlIndicators.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicators.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>jsonmin</format>
- <template>jsonminIndicators.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- IndicatorGroup -->
-
- <request>
- <name>getAllIndicatorGroups</name>
- <bean>org.hisp.dhis.indicator.IndicatorService</bean>
- <method>getAllIndicatorGroups</method>
- <template>xmlIndicatorGroups.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonIndicatorGroups.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- DataSet -->
-
- <request>
- <name>getAllDataSets</name>
- <bean>org.hisp.dhis.dataset.DataSetService</bean>
- <method>getAllDataSets</method>
- <template>xmlDataSets.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataSets.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataSet</name>
- <bean>org.hisp.dhis.dataset.DataSetService</bean>
- <method>getDataSet</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlDataSet.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataSet.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataSetByName</name>
- <bean>org.hisp.dhis.dataset.DataSetService</bean>
- <method>getDataSetByName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>name</name>
- </parameter>
- </parameters>
- <template>xmlDataSet.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataSet.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getDataSetByShortName</name>
- <bean>org.hisp.dhis.dataset.DataSetService</bean>
- <method>getDataSetByShortName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>shortName</name>
- </parameter>
- </parameters>
- <template>xmlDataSet.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonDataSet.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- Period -->
-
- <request>
- <name>getAllPeriods</name>
- <bean>org.hisp.dhis.period.PeriodService</bean>
- <method>getAllPeriods</method>
- <template>xmlPeriods.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonPeriods.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getPeriodsByPeriodType</name>
- <bean>org.hisp.dhis.webservice.adapter.period.PeriodServiceAdapter</bean>
- <method>getPeriodsByPeriodType</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>periodTypeId</name>
- </parameter>
- </parameters>
- <template>xmlPeriods.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonPeriods.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- PeriodType -->
-
- <request>
- <name>getAllPeriodTypes</name>
- <bean>org.hisp.dhis.period.PeriodStore</bean>
- <method>getAllPeriodTypes</method>
- <template>xmlPeriodTypes.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonPeriodTypes.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- OrganisationUnit -->
-
- <request>
- <name>getAllOrganisationUnits</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getAllOrganisationUnits</method>
- <template>xmlOrganisationUnits.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnits.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>pdf</format>
- <type>file</type>
- <bean>org.hisp.dhis.pdf.PdfService</bean>
- <method>writeAllOrganisationUnits</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/pdf</contentType>
- </response>
- <response>
- <format>xls</format>
- <type>file</type>
- <bean>org.hisp.dhis.workbook.WorkbookService</bean>
- <method>writeAllOrganisationUnits</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- </parameters>
- <contentType>application/vnd.ms-excel</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getOrganisationUnitsAtLevel</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnitsAtLevel</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>level</name>
- </parameter>
- </parameters>
- <template>xmlOrganisationUnits.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>xmlcomp</format>
- <template>xmlcompOrganisationUnits.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnits.vm</template>
- <contentType>application/json</contentType>
- </response>
-
- </responses>
- </request>
-
- <request>
- <name>getOrganisationUnit</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnit</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlOrganisationUnit.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnit.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getOrganisationUnitByName</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnitByName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>name</name>
- </parameter>
- </parameters>
- <template>xmlOrganisationUnit.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnit.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getOrganisationUnitByShortName</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnitByShortName</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>shortName</name>
- </parameter>
- </parameters>
- <template>xmlOrganisationUnit.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnit.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getOrganisationUnitByCode</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnitByCode</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>code</name>
- </parameter>
- </parameters>
- <template>xmlOrganisationUnit.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnit.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>updateOrganisationUnitGeoCode</name>
- <type>void</type>
- <bean>org.hisp.dhis.webservice.adapter.organisationunit.OrganisationUnitServiceAdapter</bean>
- <method>updateOrganisationUnitGeoCode</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>geoCode</name>
- </parameter>
- </parameters>
- </request>
-
- <!-- OrganisationUnitLevel -->
-
- <request>
- <name>getOrganisationUnitLevels</name>
- <bean>org.hisp.dhis.organisationunit.OrganisationUnitService</bean>
- <method>getOrganisationUnitLevels</method>
- <template>xmlOrganisationUnitLevels.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonOrganisationUnitLevels.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- ReportTableData -->
-
- <request>
- <name>getReportTableData</name>
- <bean>org.hisp.dhis.reporttable.ReportTableService</bean>
- <method>getReportTableData</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlReportTableData.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>html</format>
- <template>htmlReportTableData.vm</template>
- <contentType>text/html</contentType>
- </response>
- <response>
- <format>csshtml</format>
- <template>cssHtmlReportTableData.vm</template>
- <contentType>text/html</contentType>
- </response>
- <response>
- <format>xls</format>
- <type>file</type>
- <bean>org.hisp.dhis.workbook.WorkbookService</bean>
- <method>writeReportTableData</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <contentType>application/vnd.ms-excel</contentType>
- </response>
- </responses>
- </request>
-
- <!-- ReportTable -->
-
- <request>
- <name>getAllReportTables</name>
- <bean>org.hisp.dhis.reporttable.ReportTableService</bean>
- <method>getAllReportTables</method>
- <template>xmlReportTables.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonReportTables.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getReportTable</name>
- <bean>org.hisp.dhis.reporttable.ReportTableService</bean>
- <method>getReportTable</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- <template>xmlReportTable.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonReportTable.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- Chart -->
-
- <request>
- <name>getAllCharts</name>
- <bean>org.hisp.dhis.chart.ChartService</bean>
- <method>getAllCharts</method>
- <template>xmlCharts.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonCharts.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- DataSetCompletenessResult -->
-
- <request>
- <name>getDataSetCompleteness</name>
- <bean>org.hisp.dhis.completeness.DataSetCompletenessService</bean>
- <method>getDataSetCompleteness</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>periodId</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>organisationUnitId</name>
- </parameter>
- </parameters>
- <template>xmlDataCompleteness.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>html</format>
- <template>htmlDataCompleteness.vm</template>
- <contentType>text/html</contentType>
- </response>
- <response>
- <format>csshtml</format>
- <template>cssHtmlDataCompleteness.vm</template>
- <contentType>text/html</contentType>
- </response>
- <response>
- <format>xls</format>
- <type>file</type>
- <bean>org.hisp.dhis.workbook.WorkbookService</bean>
- <method>writeDataSetCompleteness</method>
- <parameters>
- <parameter>
- <type>java.io.OutputStream</type>
- <name>outputStream</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>periodId</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>organisationUnitId</name>
- </parameter>
- </parameters>
- <contentType>application/vnd.ms-excel</contentType>
- </response>
- </responses>
- </request>
-
- <!-- JFreeChart -->
-
- <request>
- <name>getChart</name>
- <type>chart</type>
- <bean>org.hisp.dhis.chart.ChartService</bean>
- <method>getJFreeChart</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>id</name>
- </parameter>
- </parameters>
- </request>
-
- <!-- AggregatedMapValue -->
-
- <request>
- <name>getMapValues</name>
- <bean>org.hisp.dhis.datamart.DataMartStore</bean>
- <method>getAggregatedMapValues</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>indicatorId</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>periodId</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>level</name>
- </parameter>
- </parameters>
- <template>xmlAggregatedMapValues.vm</template>
- <responses>
- <response>
- <format>xml</format>
- </response>
- <response>
- <format>json</format>
- <template>jsonAggregatedMapValues.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- PivotTable -->
-
- <request>
- <name>getPivotTable</name>
- <bean>org.hisp.dhis.pivottable.PivotTableService</bean>
- <method>getPivotTable</method>
- <parameters>
- <parameter>
- <type>int</type>
- <name>indicatorGroupId</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>periodTypeName</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>startDate</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>endDate</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>level</name>
- </parameter>
- </parameters>
- <template>jsonPivotTable.vm</template>
- <responses>
- <response>
- <format>json</format>
- <template>jsonPivotTable.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <!-- Mapping -->
-
- <request>
- <name>addOrUpdateMap</name>
- <type>void</type>
- <bean>org.hisp.dhis.mapping.MappingServiceAdapter</bean>
- <method>addOrUpdateMap</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>mapLayerPath</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>organisationUnitId</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>organisationUnitLevelId</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>uniqueColumn</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>nameColumn</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>longitude</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>latitude</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>zoom</name>
- </parameter>
- </parameters>
- </request>
-
- <request>
- <name>getAllMaps</name>
- <bean>org.hisp.dhis.mapping.MappingService</bean>
- <method>getAllMaps</method>
- <template>xmlMaps.vm</template>
- <responses>
- <response>
- <format>json</format>
- <template>jsonMaps.vm</template>
- <contentType>application/json</contentType>
- </response>
- <response>
- <format>jsonmin</format>
- <template>jsonminMaps.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>getMapByMapLayerPath</name>
- <bean>org.hisp.dhis.mapping.MappingService</bean>
- <method>getMapByMapLayerPath</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>mapLayerPath</name>
- </parameter>
- </parameters>
- <template>xmlMap.vm</template>
- <responses>
- <response>
- <format>json</format>
- <template>jsonMap.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- <request>
- <name>deleteMapByMapLayerPath</name>
- <type>void</type>
- <bean>org.hisp.dhis.mapping.MappingService</bean>
- <method>deleteMapByMapLayerPath</method>
- <methodTypes>
- <value>post</value>
- <value>delete</value>
- </methodTypes>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>mapLayerPath</name>
- </parameter>
- </parameters>
- </request>
-
- <request>
- <name>addOrUpdateMapOrganisationUnitRelation</name>
- <type>void</type>
- <bean>org.hisp.dhis.mapping.MappingService</bean>
- <method>addOrUpdateMapOrganisationUnitRelation</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>mapLayerPath</name>
- </parameter>
- <parameter>
- <type>int</type>
- <name>organisationUnitId</name>
- </parameter>
- <parameter>
- <type>java.lang.String</type>
- <name>featureId</name>
- </parameter>
- </parameters>
- </request>
-
- <request>
- <name>getAvailableMapOrganisationUnitRelations</name>
- <bean>org.hisp.dhis.mapping.MappingService</bean>
- <method>getAvailableMapOrganisationUnitRelations</method>
- <parameters>
- <parameter>
- <type>java.lang.String</type>
- <name>mapLayerPath</name>
- </parameter>
- </parameters>
- <template>xmlMapOrganisationUnitRelations.vm</template>
- <responses>
- <response>
- <format>json</format>
- <template>jsonMapOrganisationUnitRelations.vm</template>
- <contentType>application/json</contentType>
- </response>
- </responses>
- </request>
-
- </requests>
-
-</expoze>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/htmlDataCompleteness.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/htmlDataCompleteness.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/htmlDataCompleteness.vm 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<html>
- <body>
- <table>
- <tr>
- <th>Name</th>
- <th>Actual</th>
- <th>Target</th>
- <th>Percentage</th>
- <th>On time</th>
- <th>Percentage</th>
- </tr>
- #foreach( $result in $object )
- <tr>
- <td>$result.name</td>
- <td>$result.sources</td>
- <td>$result.registrations</td>
- <td>$result.getPercentage()</td>
- <td>$result.registrationsOnTime</td>
- <td>$result.getPercentageOnTime()</td>
- </tr>
- #end
- </table>
- </body>
-</html>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/htmlReportTableData.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/htmlReportTableData.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/htmlReportTableData.vm 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-
-<html>
- <body>
- <table>
- <tr>
- <td colspan="$object.columns.values().size()"><h3>$object.name</h3></td>
- </tr>
- <tr>
- #foreach( $column in $object.columns.values() )
- <th>$column</th>
- #end
- </tr>
- #foreach( $row in $object.rows )
- <tr>
- #foreach( $value in $row.values() )
- <td>$value</td>
- #end
- </tr>
- #end
- </table>
- </body>
-</html>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedDataValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedDataValues.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedDataValues.vm 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{ "aggregatedDataValues": [
-#foreach( $value in $object )
- {
- "dataElementId": ${value.dataElementId},
- "categoryOptionComboId": ${value.categoryOptionComboId},
- "periodId": ${value.periodId},
- "periodTypeId": ${value.periodTypeId},
- "organisationUnitId": ${value.organisationUnitId},
- "level": ${value.level},
- "value": ${value.value}
- },
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedIndicatorValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedIndicatorValues.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedIndicatorValues.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-{ "aggregatedIndicatorValues": [
-#foreach( $value in $object )
- {
- "indicatorId": ${value.indicatorId},
- "periodId": ${value.periodId},
- "periodTypeId": ${value.periodTypeId},
- "organisationUnitId": ${value.organisationUnitId},
- "level": ${value.level},
- "annualized": ${value.annualized},
- "factor": ${value.factor},
- "value": ${value.value},
- "numeratorValue": ${value.numeratorValue},
- "denominatorValue": ${value.denominatorValue}
- },
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedMapValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedMapValues.vm 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonAggregatedMapValues.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-{ "mapvalues": [
-#foreach( $value in $object )
- {
- "organisationUnitId": $!{value.organisationUnitId},
- "geoCode": "$!{value.geoCode}",
- "orgUnit": "$!{value.organisationUnitName}",
- "value": $!{value.value}
- },
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonCharts.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonCharts.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonCharts.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{ "charts": [
-#foreach( $chart in $object )
- {
- "id": $!{chart.id},
- "title": "$!{chart.title}"
- },
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonDataElement.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonDataElement.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{ "dataElement":
- {
- "id": $!{object.id},
- "name": "$!{object.name}",
- "alternativeName": "$!{object.alternativeNamee}",
- "shortName": "$!{object.shortName}",
- "code": "$!{object.code}",
- "description": "$!{object.description}",
- "active": "$!{object.active}",
- "type": "$!{object.type}",
- "aggregationOperator": "$!{object.aggregationOperator}"
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonDataElements.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonDataElements.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonDataElements.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#set( $size = $object.size() )
-{ "dataElements": [
-#foreach( $dataElement in $object )
- {
- "id": $!{dataElement.id},
- "name": "$!{dataElement.name}",
- "alternativeName": "$!{dataElement.alternativeNamee}",
- "shortName": "$!{dataElement.shortName}",
- "code": "$!{dataElement.code}",
- "description": "$!{dataElement.description}",
- "active": "$!{dataElement.active}",
- "type": "$!{dataElement.type}",
- "aggregationOperator": "$!{dataElement.aggregationOperator}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonDataSet.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonDataSet.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonDataSet.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{ "dataSet":
- {
- "id": $!{object.id},
- "name": "$!{object.name}",
- "shortName": "$!{object.shortName}",
- "periodTypeId": "$!{object.periodTypeId}"
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonDataSets.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonDataSets.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonDataSets.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#set( $size = $object.size() )
-{ "dataSets": [
-#foreach( $dataSet in $object )
- {
- "id": $!{dataSet.id},
- "name": "$!{dataSet.name}",
- "shortName": "$!{dataSet.shortName}",
- "periodTypeId": "$!{dataSet.periodTypeId}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonIndicator.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonIndicator.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonIndicator.vm 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-{ "indicator":
- {
- "id": $!{object.id},
- "name": "$!{object.name}",
- "alternativeName": "$!{object.alternativeNamee}",
- "shortName": "$!{object.shortName}",
- "code": "$!{object.code}",
- "annualized": "${object.annualized}",
- "indicatorTypeId": "$!{object.indicatorType.id}",
- "numerator": "$!{object.numerator}",
- "numeratorDescription": "$!{object.numeratorDescription}",
- "numeratorAggregationOperator": "$!{object.numeratorAggregationOperator}",
- "denominator": "$!{object.denominator}",
- "denominatorDescription": "$!{object.denominatorDescription}",
- "denominatorAggregationOperator": "$!{object.denominatorAggregationOperator}"
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonIndicatorGroups.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonIndicatorGroups.vm 2009-03-10 15:09:59 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonIndicatorGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "indicatorGroups": [
-#foreach( $indicatorGroup in $object )
- {
- "id": $!{indicatorGroup.id},
- "name": "$!{indicatorGroup.name}",
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonIndicators.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonIndicators.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonIndicators.vm 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#set( $size = $object.size() )
-{ "indicators": [
-#foreach( $indicator in $object )
- {
- "id": $!{indicator.id},
- "name": "$!encoder.jsonEncode( ${indicator.name} )",
- "alternativeName": "$!encoder.jsonEncode( ${indicator.alternativeNamee} )",
- "shortName": "$!encoder.jsonEncode( ${indicator.shortName} )",
- "code": "$!encoder.jsonEncode( ${indicator.code} )",
- "annualized": "${indicator.annualized}",
- "indicatorTypeId": $!{indicator.indicatorType.id},
- "numerator": "$!encoder.jsonEncode( ${indicator.numerator} )",
- "numeratorDescription": "$!encoder.jsonEncode( ${indicator.numeratorDescription} )",
- "numeratorAggregationOperator": "$!encoder.jsonEncode( ${indicator.numeratorAggregationOperator} )",
- "denominator": "$!encoder.jsonEncode( ${indicator.denominator} )",
- "denominatorDescription": "$!encoder.jsonEncode( ${indicator.denominatorDescription} )",
- "denominatorAggregationOperator": "$!encoder.jsonEncode( ${indicator.denominatorAggregationOperator} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonLegendMinMax.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonLegendMinMax.vm 2009-03-10 15:09:59 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonLegendMinMax.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-{ "legendSet": [
- {
- "id": $!{object.id},
- "name": "$!{object.name}",
- "min-value": "$!{object.getMinLegend().min}",
- "min-color": "$!{object.getMinLegend().color}",
- "max-value": "$!{object.getMaxLegend().max}",
- "max-color": "$!{object.getMaxLegend().color}"
- }
- ]
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonMap.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonMap.vm 2009-04-14 12:17:30 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonMap.vm 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{ "map":
- {
- "id": $!{object.id},
- "mapLayerPath": "$!encoder.jsonEncode( ${object.mapLayerPath} )",
- "organisationUnit": "$!encoder.jsonEncode( ${object.organisationUnit.name} )",
- "organisationUnitLevel": $!{object.organisationUnitLevel.level},
- "uniqueColumn": "$!encoder.jsonEncode( ${object.uniqueColumn} )",
- "nameColumn": "$!encoder.jsonEncode( ${object.nameColumn} )",
- "longitude": "$!encoder.jsonEncode( ${object.longitude} )",
- "latitude": "$!encoder.jsonEncode( ${object.latitude} )",
- "zoom": $!{object.zoom}
- }
-}
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonMapOrganisationUnitRelations.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonMapOrganisationUnitRelations.vm 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonMapOrganisationUnitRelations.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#set( $size = $object.size() )
-{ "mapOrganisationUnitRelations": [
-#foreach( $mapOrganisationUnitRelation in $object )
- {
- "id": $!{mapOrganisationUnitRelation.id},
- "map": "$!encoder.jsonEncode( ${mapOrganisationUnitRelation.map.mapLayerPath} )",
- "organisationUnit": "$!encoder.jsonEncode( ${mapOrganisationUnitRelation.organisationUnit.name} )",
- "organisationUnitId": $!{mapOrganisationUnitRelation.organisationUnit.id},
- "featureId": "$!{mapOrganisationUnitRelation.featureId}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonMaps.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonMaps.vm 2009-04-14 12:17:30 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonMaps.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#set( $size = $object.size() )
-{ "maps": [
-#foreach( $map in $object )
- {
- "id": $!{map.id},
- "mapLayerPath": "$!encoder.jsonEncode( ${map.mapLayerPath} )",
- "organisationUnit": "$!encoder.jsonEncode( ${map.organisationUnit.name} )",
- "organisationUnitLevel": $!{map.organisationUnitLevel.level},
- "uniqueColumn": "$!encoder.jsonEncode( ${map.uniqueColumn} )",
- "nameColumn": "$!encoder.jsonEncode( ${map.nameColumn} )",
- "longitude": "$!encoder.jsonEncode( ${map.longitude} )",
- "latitude": "$!encoder.jsonEncode( ${map.latitude} )",
- "zoom": $!{map.zoom}
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnit.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnit.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnit.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-{ "organisationUnit":
- {
- "id": $!{object.id},
- "name": "$!{object.name}",
- "shortName": "$!{object.shortName}",
- "code": "$!{object.code}",
- "openingDate": "$!{object.openingDate}",
- "closedDate": "$!{object.closedDate}",
- "active": "$!{object.active}",
- "comment": "$!{object.comment}",
- "geoCode": "$!{object.geoCode}",
- "latitude": "$!{object.latitude}",
- "longitude": "$!{object.longitude}"
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnitLevels.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnitLevels.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnitLevels.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#set( $size = $object.size() )
-{ "organisationUnitLevels": [
-#foreach ( $level in $object )
- {
- "id": $!{level.id},
- "level": $!{level.level},
- "name": "$!{level.name}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnits.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnits.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonOrganisationUnits.vm 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#set( $size = $object.size() )
-{ "organisationUnits": [
-#foreach ( $unit in $object )
- {
- "id": $!{unit.id},
- "name": "$!{unit.name}",
- "shortName": "$!{unit.shortName}",
- "code": "$!{unit.code}",
- "openingDate": "$!{unit.openingDate}",
- "closedDate": "$!{unit.closedDate}",
- "active": "$!{unit.active}",
- "comment": "$!{unit.comment}",
- "geoCode": "$!{unit.geoCode}",
- "latitude": "$!{unit.latitude}",
- "longitude": "$!{unit.longitude}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
-
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonPeriodTypes.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonPeriodTypes.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonPeriodTypes.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "periodTypes": [
-#foreach( $periodType in $object )
- {
- "id": $!{periodType.id},
- "name": "$!{periodType.name}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonPeriods.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonPeriods.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonPeriods.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#set( $size = $object.size() )
-{ "periods": [
-#foreach( $period in $object )
- {
- "id": $!{period.id},
- "startDate": "$!format.formatDate( ${period.startDate} )",
- "endDate": "$!format.formatDate( ${period.endDate} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonPivotTable.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonPivotTable.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonPivotTable.vm 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-{
- "pivotTable":
- {
- "sizeIndicators": "$object.indicators.size()",
- "sizePeriods": "$object.periods.size()",
- "sizeOrganisationUnits": "$object.organisationUnits.size()",
- "indicators":
- [
- #foreach( $indicator in $object.indicators )
- { "id": "${indicator.id}", "name": "${indicator.shortName}" },
- #end
- ],
- "periods":
- [
- #foreach( $period in $object.periods )
- { "id": "${period.id}", "name": "${period.name}" },
- #end
- ],
- "organisationUnits":
- [
- #foreach( $organisationUnit in $object.organisationUnits )
- { "id": "${organisationUnit.id}", "name": "${organisationUnit.shortName}" },
- #end
- ],
- "indicatorValues":
- [
- {
- #foreach( $value in $object.indicatorValues )
- "${value.indicatorId}-${value.periodId}-${value.organisationUnitId}": "${value.value}",
- #end
- }
- ]
- }
-}
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonReportTable.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonReportTable.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonReportTable.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-{ "reportTable":
- {
- "id": $!{object.id},
- "name": "$!{object.name}"
- }
-}
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonReportTables.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonReportTables.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonReportTables.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "reportTables": [
-#foreach( $reportTable in $object )
- {
- "id": $!{reportTable.id},
- "name": "$!{reportTable.name}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonminDataElements.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonminDataElements.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonminDataElements.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "dataElements": [
-#foreach( $dataElement in $object )
- {
- "id": $!{dataElement.id},
- "name": "$!{dataElement.name}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonminIndicators.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonminIndicators.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonminIndicators.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "indicators": [
-#foreach( $indicator in $object )
- {
- "id": $!{indicator.id},
- "name": "$!encoder.jsonEncode( ${indicator.name} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/jsonminMaps.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/jsonminMaps.vm 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/jsonminMaps.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#set( $size = $object.size() )
-{ "maps": [
-#foreach( $map in $object )
- {
- "id": $!{map.id},
- "mapLayerPath": "$!encoder.jsonEncode( ${map.mapLayerPath} )",
- "organisationUnitLevel": $!{map.organisationUnitLevel.level}
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedDataValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedDataValues.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedDataValues.vm 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregatedDataValues>
-#foreach( $value in $object )
- <aggregatedDataValue>
- <dataElementId>$value.dataElementId</dataElementId>
- <categoryOptionComboId>$value.categoryOptionComboId</categoryOptionComboId>
- <periodId>$value.periodId</periodId>
- <periodTypeId>$value.periodTypeId</periodTypeId>
- <organisationUnitId>$value.organisationUnitId</organisationUnitId>
- <level>$value.level</level>
- <value>$value.value</value>
- </aggregatedDataValue>
-#end
-</aggregatedDataValues>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedIndicatorValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedIndicatorValues.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedIndicatorValues.vm 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregatedIndicatorValues>
-#foreach( $value in $object )
- <aggregatedIndicatorValue>
- <indicatorId>$value.indicatorId</indicatorId>
- <periodId>$value.periodId</periodId>
- <periodTypeId>$value.periodTypeId</periodTypeId>
- <organisationUnitId>$value.organisationUnitId</organisationUnitId>
- <level>$value.level</level>
- <annualized>$value.annualized</annualized>
- <factor>$value.factor</factor>
- <value>$value.value</value>
- <numeratorValue>$value.numeratorValue</numeratorValue>
- <denominatorValue>$value.denominatorValue</denominatorValue>
- </aggregatedIndicatorValue>
-#end
-</aggregatedIndicatorValues>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedMapValues.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedMapValues.vm 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlAggregatedMapValues.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregatedMapValues>
-#foreach( $value in $object )
- <aggregatedMapValue>
- <organisationUnitId>$value.organisationUnitId</organisationUnitId>
- <geoCode>$value.geoCode</geoCode>
- <orgUnit>$value.organisationUnitName</orgUnit>
- <value>$value.value</value>
- </aggregatedMapValue>
-#end
-</aggregatedMapValues>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlCharts.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlCharts.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlCharts.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<charts>
-#foreach( $chart in $object )
- <chart>
- <id>$chart.id</id>
- <title>$!encoder.xmlEncode( $chart.title )</title>
- </chart>
-#end
-</charts>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlDataCompleteness.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlDataCompleteness.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlDataCompleteness.vm 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSetCompletenessResults>
-#foreach( $result in $object )
- <dataSetCompletenessResult>
- <name>$!encoder.xmlEncode( $result.name )</name>
- <sources>$result.sources</sources>
- <registrations>$result.registrations</registrations>
- <percentage>$result.getPercentage()</percentage>
- <registrationsOnTime>$result.registrationsOnTime</registrationsOnTime>
- <percentageOnTime>$result.getPercentageOnTime()</percentageOnTime>
- </dataSetCompletenessResult>
-#end
-</dataSetCompletenessResults>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlDataElement.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlDataElement.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataElement>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <alternativeName>$!encoder.xmlEncode( $object.alternativeName )</alternativeName>
- <shortName>$!encoder.xmlEncode( $object.shortName )</shortName>
- <code>$!encoder.xmlEncode( $object.code )</code>
- <description>$!encoder.xmlEncode( $object.description )</description>
- <active>$object.active</active>
- <type>$!encoder.xmlEncode( $object.type )</type>
- <aggregationOperator>$!encoder.xmlEncode( $object.aggregationOperator )</aggregationOperator>
-</dataElement>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlDataElements.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlDataElements.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlDataElements.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataElements>
-#foreach( $dataElement in $object )
- <dataElement>
- <id>$dataElement.id</id>
- <name>$!encoder.xmlEncode( $dataElement.name )</name>
- <alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
- <shortName>$!encoder.xmlEncode( $dataElement.shortName )</shortName>
- <code>$!encoder.xmlEncode( $dataElement.code )</code>
- <description>$!encoder.xmlEncode( $dataElement.description )</description>
- <active>$dataElement.active</active>
- <type>$!encoder.xmlEncode( $dataElement.type )</type>
- <aggregationOperator>$!encoder.xmlEncode( $dataElement.aggregationOperator )</aggregationOperator>
- </dataElement>
-#end
-</dataElements>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlDataSet.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlDataSet.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlDataSet.vm 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSet>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <shortName>$!encoder.xmlEncode( $object.shortName )</shortName>
- <periodTypeId>$object.periodType.id</periodTypeId>
-</dataSet>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlDataSets.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlDataSets.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlDataSets.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSets>
-#foreach( $dataSet in $object )
- <dataSet>
- <id>$dataSet.id</id>
- <name>$!encoder.xmlEncode( $dataSet.name )</name>
- <shortName>$!encoder.xmlEncode( $dataSet.shortName )</shortName>
- <periodTypeId>$dataSet.periodType.id</periodTypeId>
- </dataSet>
-#end
-</dataSets>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlIndicator.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlIndicator.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlIndicator.vm 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicator>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <alternativeName>$!encoder.xmlEncode( $object.alternativeName )</alternativeName>
- <shortName>$!encoder.xmlEncode( $object.shortName )</shortName>
- <code>$!encoder.xmlEncode( $object.code )</code>
- <description>$!encoder.xmlEncode( $object.description )</description>
- <annualized>$object.annualized</annualized>
- <indicatorTypeId>$object.indicatorType.id</indicatorTypeId>
- <numerator>$!encoder.xmlEncode( $object.numerator )</numerator>
- <numeratorDescription>$!encoder.xmlEncode( $object.numeratorDescription )</numeratorDescription>
- <numeratorAggregationOperator>$!encoder.xmlEncode( $object.numeratorAggregationOperator )</numeratorAggregationOperator>
- <denominator>$!encoder.xmlEncode( $object.denominator )</denominator>
- <denominatorDescription>$!encoder.xmlEncode( $object.denominatorDescription )</denominatorDescription>
- <denominatorAggregationOperator>$!encoder.xmlEncode( $object.denominatorAggregationOperator )</denominatorAggregationOperator>
-</indicator>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlIndicatorGroups.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlIndicatorGroups.vm 2009-03-10 15:09:59 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlIndicatorGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicatorGroups>
-#foreach( $indicatorGroup in $object )
- <indicatorGroup>
- <id>$indicatorGroup.id</id>
- <name>$!encoder.xmlEncode( $indicatorGroup.name )</name>
- </indicatorGroup>
-#end
-</indicatorGroups>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlIndicators.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlIndicators.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlIndicators.vm 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicators>
-#foreach( $indicator in $object )
- <indicator>
- <id>$indicator.id</id>
- <name>$!encoder.xmlEncode( $indicator.name )</name>
- <alternativeName>$!encoder.xmlEncode( $indicator.alternativeName )</alternativeName>
- <shortName>$!encoder.xmlEncode( $indicator.shortName )</shortName>
- <code>$!encoder.xmlEncode( $indicator.code )</code>
- <description>$!encoder.xmlEncode( $indicator.description )</description>
- <annualized>$indicator.annualized</annualized>
- <indicatorTypeId>$indicator.indicatorType.id</indicatorTypeId>
- <numerator>$!encoder.xmlEncode( $indicator.numerator )</numerator>
- <numeratorDescription>$!encoder.xmlEncode( $indicator.numeratorDescription )</numeratorDescription>
- <numeratorAggregationOperator>$!encoder.xmlEncode( $indicator.numeratorAggregationOperator )</numeratorAggregationOperator>
- <denominator>$!encoder.xmlEncode( $indicator.denominator )</denominator>
- <denominatorDescription>$!encoder.xmlEncode( $indicator.denominatorDescription )</denominatorDescription>
- <denominatorAggregationOperator>$!encoder.xmlEncode( $indicator.denominatorAggregationOperator )</denominatorAggregationOperator>
- </indicator>
-#end
-</indicators>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlLegendMinMax.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlLegendMinMax.vm 2009-03-10 15:09:59 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlLegendMinMax.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<legendSet>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <min-value>$!object.getMinLegend().min</min-value>
- <min-color>$!object.getMinLegend().color</min-color>
- <max-value>$!object.getMaxLegend().max</max-value>
- <max-color>$!object.getMaxLegend().color</max-color>
-</legendSet>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlMap.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlMap.vm 2009-04-14 12:17:30 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlMap.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map>
- <id>$object.id</id>
- <mapLayerPath>$!encoder.xmlEncode( $object.mapLayerPath )</mapLayerPath>
- <organisationUnit>$!encoder.xmlEncode( $object.organisationUnit.name )</organisationUnit>
- <organisationUnitLevel>$object.organisationUnitLevel.level</organisationUnitLevel>
- <uniqueColumn>$!encoder.xmlEncode( $object.uniqueColumn )</uniqueColumn>
- <nameColumn>$!encoder.xmlEncode( $object.nameColumn )</nameColumn>
- <longitude>$!encoder.xmlEncode( $object.longitude )</longitude>
- <latitude>$!encoder.xmlEncode( $object.latitude )</latitude>
- <zoom>$object.zoom</zoom>
-</map>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlMapOrganisationUnitRelations.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlMapOrganisationUnitRelations.vm 2009-04-06 18:55:31 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlMapOrganisationUnitRelations.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mapOrganisationUnitRelations>
-#foreach( $mapOrganisationUnitRelation in $object )
- <mapOrganisationUnitRelation>
- <id>$mapOrganisationUnitRelation.id</id>
- <map>$!encoder.xmlEncode( $mapOrganisationUnitRelation.map.mapLayerPath )</map>
- <organisationUnit>$!encoder.xmlEncode( $mapOrganisationUnitRelation.organisationUnit.name )</organisationUnit>
- <organisationUnitId>$mapOrganisationUnitRelation.organisationUnit.id</organisationUnitId>
- <featureId>$!encoder.xmlEncode( $mapOrganisationUnitRelation.featureId )</featureId>
- </mapOrganisationUnitRelation>
-#end
-</mapOrganisationUnitRelations>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlMaps.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlMaps.vm 2009-04-14 12:17:30 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlMaps.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<maps>
-#foreach( $map in $object )
- <map>
- <id>$map.id</id>
- <mapLayerPath>$!encoder.xmlEncode( $map.mapLayerPath )</mapLayerPath>
- <organisationUnit>$!encoder.xmlEncode( $map.organisationUnit.name )</organisationUnit>
- <organisationUnitLevel>$map.organisationUnitLevel.level</organisationUnitLevel>
- <uniqueColumn>$!encoder.xmlEncode( $map.uniqueColumn )</uniqueColumn>
- <nameColumn>$!encoder.xmlEncode( $map.nameColumn )</nameColumn>
- <longitude>$!encoder.xmlEncode( $map.longitude )</longitude>
- <latitude>$!encoder.xmlEncode( $map.latitude )</latitude>
- <zoom>$map.zoom</zoom>
- </map>
-#end
-</maps>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnit.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnit.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnit.vm 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<organisationUnit>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <shortName>$!encoder.xmlEncode( $object.shortName )</shortName>
- <code>$!encoder.xmlEncode( $object.organisationUnitCode )</code>
- <openingDate>$!format.formatPeriod( $object.openingDate )</openingDate>
- <closedDate>$!format.formatPeriod( $object.closedDate )</closedDate>
- <active>$object.active</active>
- <comment>$!encoder.xmlEncode( $object.comment )</comment>
- <geoCode>$!encoder.xmlEncode( $object.geoCode )</geoCode>
- <latitude>$!encoder.xmlEncode( $object.latitude )</latitude>
- <longitude>$!encoder.xmlEncode( $object.longitude )</longitude>
-</organisationUnit>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnitLevels.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnitLevels.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnitLevels.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<organisationUnitLevels>
-#foreach ( $level in $object )
- <organisationUnitLevel>
- <id>$level.id</id>
- <level>$level.level</level>
- <name>$!encoder.xmlEncode( $level.name )</name>
- </organisationUnitLevel>
-#end
-</organisationUnitLevels>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnits.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnits.vm 2009-03-18 11:05:02 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlOrganisationUnits.vm 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<organisationUnits>
-#foreach ( $unit in $object )
- <organisationUnit>
- <id>$unit.id</id>
- <name>$!encoder.xmlEncode( $unit.name )</name>
- <shortName>$!encoder.xmlEncode( $unit.shortName )</shortName>
- <code>$!encoder.xmlEncode( $unit.organisationUnitCode )</code>
- <openingDate>$!format.formatPeriod( $unit.openingDate )</openingDate>
- <closedDate>$!format.formatPeriod( $unit.closedDate )</closedDate>
- <active>$unit.active</active>
- <comment>$!encoder.xmlEncode( $unit.comment )</comment>
- <geoCode>$!encoder.xmlEncode( $unit.geoCode )</geoCode>
- <latitude>$!encoder.xmlEncode( $unit.latitude )</latitude>
- <longitude>$!encoder.xmlEncode( $unit.longitude )</longitude>
- </organisationUnit>
-#end
-</organisationUnits>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlPeriodTypes.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlPeriodTypes.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlPeriodTypes.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<periodTypes>
-#foreach( $periodType in $object )
- <periodType>
- <id>$periodType.id</id>
- <name>$encoder.xmlEncode( $periodType.name )</name>
- </periodType>
-#end
-</periodTypes>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlPeriods.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlPeriods.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlPeriods.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<periods>
-#foreach( $period in $object )
- <period>
- <id>$period.id</id>
- <startDate>$!format.formatDate( $period.startDate )</startDate>
- <endDate>$!format.formatDate( $period.endDate )</endDate>
- </period>
-#end
-</periods>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlReportTable.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlReportTable.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlReportTable.vm 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reportTable>
- <id>$object.id</id>
- <name>$!encoder.xmlEncode( $object.name )</name>
-</reportTable>
\ No newline at end of file
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlReportTableData.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlReportTableData.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlReportTableData.vm 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reportTableData>
- <name>$!encoder.xmlEncode( $object.name )</name>
- <columns>
- #foreach( $key in $object.columns.keySet() )
- <column index="$key">$object.columns.get( $key )</column>
- #end
- </columns>
- <rows>
- #foreach( $row in $object.rows )
- <row>
- #foreach( $key in $row.keySet() )
- <value index="$key">$row.get( $key )</value>
- #end
- </row>
- #end
- </rows>
-</reportTableData>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlReportTables.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlReportTables.vm 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlReportTables.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reportTables>
-#foreach ( $table in $object )
- <reportTable>
- <id>$table.id</id>
- <name>$!encoder.xmlEncode( $table.name )</name>
- </reportTable>
-#end
-</reportTables>
=== removed file 'webservice/dhis-webservice-expoze/src/main/resources/xmlcompOrganisationUnits.vm'
--- webservice/dhis-webservice-expoze/src/main/resources/xmlcompOrganisationUnits.vm 2009-03-10 15:09:59 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/xmlcompOrganisationUnits.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<organisationUnits>
-#foreach ( $unit in $object )
- <organisationUnit id="$unit.id" name="$!encoder.xmlEncode( $unit.name )" geoCode="$!encoder.xmlEncode( $unit.geoCode )"></organisationUnit>
-#end
-</organisationUnits>
\ No newline at end of file
=== removed directory 'webservice/dhis-webservice-expoze/src/main/webapp'
=== removed directory 'webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF'
=== removed file 'webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF/web.xml'
--- webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF/web.xml 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 WebService</display-name>
-
- <!-- Spring -->
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <!-- Expoze -->
-
- <servlet>
- <servlet-name>SpringWebService</servlet-name>
- <servlet-class>org.amplecode.expoze.dispatcher.SpringWebServiceServletDispatcher</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>SpringWebService</servlet-name>
- <url-pattern>*.service</url-pattern>
- </servlet-mapping>
-
-</web-app>
=== removed directory 'webservice/dhis-webservice-expoze/src/main/webapp/css'
=== removed file 'webservice/dhis-webservice-expoze/src/main/webapp/css/stylesheet.css'
--- webservice/dhis-webservice-expoze/src/main/webapp/css/stylesheet.css 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/webapp/css/stylesheet.css 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-
-*
-{
- font-family: tahoma, sans-serif;
- line-height: 125%;
- font-size: 9pt;
-}
-
-h3
-{
- font-size: 11pt;
- color: #606060;
-}
-
-.listTable
-{
- width: 100%;
- border-collapse: collapse;
-}
-
-.listTable th
-{
- background-image: url('../images/head.png');
- background-repeat: repeat-x;
- text-align: left;
- color: #3f5d8e;
- border-style: solid;
- border-width: 1px;
- border-color: #99bbe8;
- padding-left: 7px;
- height: 19px;
- font-weight: normal;
-}
-
-.listTable td
-{
- padding: 2px;
-}
-
-.listRow
-{
- border-bottom: 1px solid #cad5e5;
- text-align: center;
-}
-
-.listAlternateRow
-{
- border-bottom: 1px solid #cad5e5;
- background-color: #ebf0f6;
- text-align: center;
-}
=== removed directory 'webservice/dhis-webservice-expoze/src/main/webapp/images'
=== removed file 'webservice/dhis-webservice-expoze/src/main/webapp/images/head.png'
Binary files webservice/dhis-webservice-expoze/src/main/webapp/images/head.png 2009-03-03 16:46:36 +0000 and webservice/dhis-webservice-expoze/src/main/webapp/images/head.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'webservice/dhis-webservice-expoze/src/main/webapp/index.html'
--- webservice/dhis-webservice-expoze/src/main/webapp/index.html 2009-03-03 16:46:36 +0000
+++ webservice/dhis-webservice-expoze/src/main/webapp/index.html 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-<script type="text/javascript">document.location.href="getRequests.service"</script>
\ No newline at end of file
