dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15988
committer: Long <long.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2014-07-07 13:29:46 +0700
message:
  [mobile] delete unused action class
removed:
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/UpdateClientAction.java
modified:
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml


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

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

=== removed directory 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action'
=== removed file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/UpdateClientAction.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/UpdateClientAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/UpdateClientAction.java	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-package org.hisp.dhis.api.mobile.action;
-
-/*
- * Copyright (c) 2004-2014, 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 com.opensymphony.xwork2.Action;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-/**
- * @author Nguyen Kim Lai
- * 
- * @version $ UpdateClientAction.java Jun 25, 2012 $
- */
-public class UpdateClientAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Output & Input
-    // -------------------------------------------------------------------------
-
-    private String fileName = "DHISMobile-Aggregate.jar";
-    private InputStream inputStream;
-    public String getFileName()
-    {
-        return fileName;
-    }
-
-    public void setFileName( String fileName )
-    {
-        this.fileName = fileName;
-    }
-
-    public InputStream getInputStream()
-    {
-        return inputStream;
-    }
-
-    public void setInputStream( InputStream inputStream )
-    {
-        this.inputStream = inputStream;
-    }
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        File fileToDownload = new File( fileName );
-            
-        inputStream = new BufferedInputStream( new FileInputStream( fileToDownload ) );
-        
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 06:29:46 +0000
@@ -4,7 +4,5 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";>
 
 	<!-- Root Context: defines shared resources visible to all other web components -->
-	<bean id="org.hisp.dhis.api.mobile.action.UpdateClientAction"
-		class="org.hisp.dhis.api.mobile.action.UpdateClientAction" scope="prototype" />
 
 </beans>

=== modified 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	2012-07-26 09:56:22 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml	2014-07-07 06:29:46 +0000
@@ -7,16 +7,6 @@
 
 	<package name="dhis-web-api-mobile" extends="dhis-web-commons"
 		namespace="/dhis-web-api-mobile">
-		<action name="updateClient"
-			class="org.hisp.dhis.api.mobile.action.UpdateClientAction">
-			<result name="success" type="stream">
-				<param name="contentType">application/.jar</param>
-				<param name="inputName">inputStream</param>
-				<param name="contentDisposition">fileName</param>
-				<param name="bufferSize">1024</param>
-			</result>
-		</action>
-
 	</package>
 
 </struts>