← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #01341

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 392: Upgraded webservice to expoze 1.0.8

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 392
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-06-23 11:17:22 +0200
message:
  Upgraded webservice to expoze 1.0.8
modified:
  webservice/dhis-webservice-expoze/pom.xml
  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/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/OrganisationUnitServiceAdapter.java
  webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml

=== modified file 'webservice/dhis-webservice-expoze/pom.xml'
--- webservice/dhis-webservice-expoze/pom.xml	2009-04-22 21:31:10 +0000
+++ webservice/dhis-webservice-expoze/pom.xml	2009-06-23 09:17:22 +0000
@@ -29,10 +29,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
-	<dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-gis</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-organisationunit</artifactId>

=== modified 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	2009-03-08 08:01:43 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/indicator/IndicatorServiceAdapter.java	2009-06-23 09:17:22 +0000
@@ -1,5 +1,32 @@
 package org.hisp.dhis.webservice.adapter.indicator;
 
+/*
+ * Copyright (c) 2004-2007, 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;

=== modified 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	2009-04-15 15:26:19 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/DefaultMappingServiceAdapter.java	2009-06-23 09:17:22 +0000
@@ -1,5 +1,32 @@
 package org.hisp.dhis.webservice.adapter.mapping;
 
+/*
+ * Copyright (c) 2004-2007, 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;
 
@@ -10,6 +37,10 @@
 import org.hisp.dhis.mapping.MapOrganisationUnitRelation;
 import org.hisp.dhis.mapping.MappingService;
 
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
 public class DefaultMappingServiceAdapter
     implements MappingServiceAdapter
 {
@@ -35,7 +66,7 @@
     // Map
     // -------------------------------------------------------------------------
 
-    public int addMap( String mapLayerPath, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
+    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 );
@@ -45,13 +76,13 @@
 
         Set<String> staticMapLayerPaths = null;
 
-        Map map = new Map( mapLayerPath, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
+        Map map = new Map( name, mapLayerPath, type, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
             latitude, zoom, staticMapLayerPaths );
 
         return mappingService.addMap( map );
     }
 
-    public void addOrUpdateMap( String mapLayerPath, int organisationUnitId, int organisationUnitLevelId,
+    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 );
@@ -77,7 +108,7 @@
         }
         else
         {
-            map = new Map( mapLayerPath, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
+            map = new Map( name, mapLayerPath, type, organisationUnit, organisationUnitLevel, uniqueColumn, nameColumn, longitude,
                 latitude, zoom, staticMapLayerPaths );
 
             mappingService.addMap( map );

=== modified 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	2009-04-15 15:26:19 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/mapping/MappingServiceAdapter.java	2009-06-23 09:17:22 +0000
@@ -1,19 +1,50 @@
 package org.hisp.dhis.webservice.adapter.mapping;
 
+/*
+ * Copyright (c) 2004-2007, 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 mapLayerPath, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
+    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 mapLayerPath, int organisationUnitId, int organisationUnitLevelId, String uniqueColumn,
+    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 );

=== modified 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	2009-03-18 16:51:22 +0000
+++ webservice/dhis-webservice-expoze/src/main/java/org/hisp/dhis/webservice/adapter/organisationunit/OrganisationUnitServiceAdapter.java	2009-06-23 09:17:22 +0000
@@ -31,7 +31,6 @@
  * @author Jan Henrik Overland
  * @version $Id$
  */
-
 public interface OrganisationUnitServiceAdapter
 {
     void updateOrganisationUnitGeoCode( int id, String geoCode );

=== modified file 'webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml'
--- webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml	2009-04-16 14:10:22 +0000
+++ webservice/dhis-webservice-expoze/src/main/resources/dispatcher.xml	2009-06-23 09:17:22 +0000
@@ -981,32 +981,7 @@
         </response>
       </responses>
     </request>
-        
-    <!-- Legend -->
-      
-    <request>
-      <name>getLegendMinAndMaxOfIndicator</name>
-      <bean>org.hisp.dhis.gis.LegendService</bean>
-      <method>getLegendSetOfIndicator</method>
-      <parameters>
-        <parameter>
-          <type>int</type>
-          <name>indicatorId</name>
-        </parameter>        
-      </parameters>
-      <template>xmlLegendMinMax.vm</template>
-      <responses>
-         <response>
-          <format>xml</format>
-        </response>
-        <response>
-          <format>json</format>
-          <template>jsonLegendMinMax.vm</template>
-          <contentType>application/json</contentType>
-        </response>      
-      </responses>
-    </request>
-	  
+        	  
 	<!-- Mapping -->
 	  
 	<request>
@@ -1094,6 +1069,10 @@
 	  <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>



--
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.
  Thread Previous • Date Previous • • Thread Next