dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15990
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-07-07 08:48:17 +0200
message:
  Mobile web api, removed struts.xml and dependency on commons modules
removed:
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml
modified:
  dhis-2/dhis-web/dhis-web-api-mobile/pom.xml
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/pom.xml	2014-04-22 15:46:19 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/pom.xml	2014-07-07 06:48:17 +0000
@@ -8,7 +8,6 @@
     <version>2.16-SNAPSHOT</version>
   </parent>
   
-
   <artifactId>dhis-web-api-mobile</artifactId>
   <packaging>jar</packaging>
   <name>DHIS Mobile API</name>
@@ -21,15 +20,7 @@
     </dependency>	
 
     <!-- DHIS -->
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-commons-resources</artifactId>
-      <type>war</type>
-    </dependency>
+    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-mobile</artifactId>

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml	2014-07-07 06:48:17 +0000
@@ -9,7 +9,6 @@
 
   <!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
 
-  <!-- Enables the Spring MVC @Controller programming model -->
   <mvc:annotation-driven>
     <mvc:message-converters>
       <bean class="org.hisp.dhis.api.mobile.support.DataStreamSerializableMessageConverter" />

=== removed file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml	2014-07-07 06:29:46 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
-<struts>
-	<include file="dhis-web-commons.xml" />
-
-	<package name="dhis-web-api-mobile" extends="dhis-web-commons"
-		namespace="/dhis-web-api-mobile">
-	</package>
-
-</struts>