dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10817
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2970: Removed old mobile module
------------------------------------------------------------
revno: 2970
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-03 13:41:49 +0530
message:
Removed old mobile module
removed:
local/in/dhis-web-mobile/
local/in/dhis-web-mobile/pom.xml
local/in/dhis-web-mobile/src/
local/in/dhis-web-mobile/src/main/
local/in/dhis-web-mobile/src/main/java/
local/in/dhis-web-mobile/src/main/java/org/
local/in/dhis-web-mobile/src/main/java/org/hisp/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports/importing/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports/importing/action/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelImportService.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelMetaParameters.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileHomePageAction.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileImportProcessAction.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/DefaultMobileImportService.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportParameters.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportService.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportStore.java
local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MySQLMobileImportStore.java
local/in/dhis-web-mobile/src/main/resources/
local/in/dhis-web-mobile/src/main/resources/META-INF/
local/in/dhis-web-mobile/src/main/resources/META-INF/dhis/
local/in/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-mobile/src/main/resources/org/
local/in/dhis-web-mobile/src/main/resources/org/hisp/
local/in/dhis-web-mobile/src/main/resources/org/hisp/dhis/
local/in/dhis-web-mobile/src/main/resources/org/hisp/dhis/sandbox/
local/in/dhis-web-mobile/src/main/resources/struts.xml
local/in/dhis-web-mobile/src/main/webapp/
local/in/dhis-web-mobile/src/main/webapp/WEB-INF/
local/in/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/StylesForTags.css
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/stylesForReports.css
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/menu.vm
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm
local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/welcome.vm
--
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 'local/in/dhis-web-mobile'
=== removed file 'local/in/dhis-web-mobile/pom.xml'
--- local/in/dhis-web-mobile/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-mobile/pom.xml 1970-01-01 00:00:00 +0000
@@ -1,65 +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.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-web-mobile</artifactId>
- <packaging>war</packaging>
- <name>DHIS Mobile Module</name>
-
- <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-jdbc</artifactId>
- <version>$version</version>
- </dependency>
- <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-aggregationengine-default</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>2.6</version>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- </dependencies>
-</project>
=== removed directory 'local/in/dhis-web-mobile/src'
=== removed directory 'local/in/dhis-web-mobile/src/main'
=== removed directory 'local/in/dhis-web-mobile/src/main/java'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports/importing'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/reports/importing/action'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api'
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelImportService.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelImportService.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelImportService.java 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-package org.hisp.dhis.sandbox.excelimport.api;
-
-/*
- * Copyright (c) 2004-2009, 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.List;
-
-public interface ExcelImportService
-{
- public List<ExcelMetaParameters> getMetaParametersFromXML();
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelMetaParameters.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelMetaParameters.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/excelimport/api/ExcelMetaParameters.java 1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-package org.hisp.dhis.sandbox.excelimport.api;
-
-/*
- * 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.
- */
-
-public class ExcelMetaParameters
-{
- private Integer sourceid;
-
- private Integer periodid;
-
- private String excelFileName;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public ExcelMetaParameters()
- {
-
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public Integer getSourceid()
- {
- return sourceid;
- }
-
- public void setSourceid( Integer sourceid )
- {
- this.sourceid = sourceid;
- }
-
- public Integer getPeriodid()
- {
- return periodid;
- }
-
- public void setPeriodid( Integer periodid )
- {
- this.periodid = periodid;
- }
-
- public String getExcelFileName()
- {
- return excelFileName;
- }
-
- public void setExcelFileName( String excelFileName )
- {
- this.excelFileName = excelFileName;
- }
-}
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport'
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action'
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileHomePageAction.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileHomePageAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileHomePageAction.java 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.action;
-
-/*
- * 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 com.opensymphony.xwork2.Action;
-
-public class MobileHomePageAction implements Action
-{
-
- public String execute()
- throws Exception
- {
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileImportProcessAction.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileImportProcessAction.java 2010-09-10 11:35:58 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/action/MobileImportProcessAction.java 1970-01-01 00:00:00 +0000
@@ -1,289 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.action;
-
-/*
- * 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.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.datavalue.DataValue;
-import org.hisp.dhis.datavalue.DataValueService;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.sandbox.mobileimport.api.MobileImportParameters;
-import org.hisp.dhis.sandbox.mobileimport.api.MobileImportService;
-import org.hisp.dhis.source.Source;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserCredentials;
-import org.hisp.dhis.user.UserStore;
-
-import com.opensymphony.xwork2.Action;
-
-public class MobileImportProcessAction
- implements Action
-{
-
- // private static final Log LOG = LogFactory.getLog(
- // MobileImportProcessAction.class );
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private MobileImportService mobileImportService;
-
- public void setMobileImportService( MobileImportService mobileImportService )
- {
- this.mobileImportService = mobileImportService;
- }
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataValueService dataValueService;
-
- public void setDataValueService( DataValueService dataValueService )
- {
- this.dataValueService = dataValueService;
- }
-
- private UserStore userStore;
-
- public void setUserStore( UserStore userStore )
- {
- this.userStore = userStore;
- }
-
- private DataElementCategoryService dataElementCategoryService;
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- // -------------------------------------------------------------------------
- // Parameters
- // -------------------------------------------------------------------------
-
- private String importStatus;
-
- public String getImportStatus()
- {
- return importStatus;
- }
-
- private String statusMessage;
-
- public String getStatusMessage()
- {
- return statusMessage;
- }
-
- private String storedBy;
-
- // -------------------------------------------------------------------------
- // Action Implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
-
- importStatus = "";
-
- List<String> fileNames = new ArrayList<String>( mobileImportService.getImportFiles() );
-
- System.out.println( fileNames.size() );
-
- for ( String importFile : fileNames )
- {
-
- MobileImportParameters mobImportParameters = mobileImportService.getParametersFromXML( importFile );
-
- if ( mobImportParameters == null )
- {
- // LOG.debug( importFile +
- // " Import File is not Propely Formated First" );
-
- System.out.println( importFile + " Import File is not Propely Formated First" );
-
- importStatus += "<br>" + new Date() + ": " + importFile + " Import File is not Propely Formated.";
-
- mobileImportService.moveFailedFile( importFile );
-
- continue;
- }
-
- User curUser = mobileImportService.getUserInfo( mobImportParameters.getMobileNumber() );
-
- UserCredentials userCredentials = userStore.getUserCredentials( curUser );
-
- if ( (userCredentials != null)
- && (mobImportParameters.getMobileNumber().equals( curUser.getPhoneNumber() )) )
- {
- storedBy = userCredentials.getUsername();
- }
- else
- {
- // LOG.debug(
- // " Import File Contains Unrecognised Phone Numbers : " +
- // mobImportParameters.getMobileNumber() );
- System.out.println( " Import File Contains Unrecognised Phone Numbers : "
- + mobImportParameters.getMobileNumber() );
- importStatus += "<br><font color=red><b>Import File Contains Unrecognised Phone Numbers :"
- + mobImportParameters.getMobileNumber() + ".</b></font>";
-
- mobileImportService.moveFailedFile( importFile );
- continue;
- // mobileImportService.moveFailedFile( importFile );
- }
-
- List<Source> sources = new ArrayList<Source>( curUser.getOrganisationUnits() );
-
- if ( sources == null || sources.size() <= 0 )
- {
- System.out.println( "Source is NULL" );
-
- importStatus += "<br><font color=red><b>No User Exist Who Registered Phone No. Is :"
- + mobImportParameters.getMobileNumber() + ".</b></font>";
-
- mobileImportService.moveFailedFile( importFile );
- // return SUCCESS;
- continue;
- }
- Source source = sources.get( 0 );
-
- Period period = mobileImportService.getPeriodInfo( mobImportParameters.getStartDate() );
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-mm-dd" );
-
- Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
-
- Map<String, Integer> dataValueMap = new HashMap<String, Integer>( mobImportParameters.getDataValues() );
-
- if ( dataValueMap == null || dataValueMap.size() <= 0 )
- {
- System.out.println( "dataValue map is null" );
- }
- else if ( source == null )
- {
- System.out.println( "source is null" );
- }
- else if ( period == null )
- {
- System.out.println( "period is null" );
- }
- else if ( timeStamp == null )
- {
- System.out.println( "timeStamp is null" );
- }
-
- if ( source == null || period == null || timeStamp == null || dataValueMap == null
- || dataValueMap.size() <= 0 )
- {
-
- System.out.println( importFile + " Import File is not Propely Formated" );
-
- importStatus += "<br>" + new Date() + ": " + importFile + " Import File is not Propely Formated.<br>";
-
- mobileImportService.moveFailedFile( importFile );
-
- continue;
- }
-
- Set<String> keys = dataValueMap.keySet();
-
- for ( String key : keys )
- {
- // DataElement dataElement = dataElementService.getDataElement(
- // key );
-
- String parts[] = key.split( "\\." );
-
- System.out.println( key + "\t : \t" + parts.length );
-
- String deStr = parts[0];
-
- String optStr = parts[1];
-
- String value = String.valueOf( dataValueMap.get( key ) );
-
- System.out.println( "OPTION ID IS : \t" + optStr );
-
- DataElement dataElement = dataElementService.getDataElement( Integer.valueOf( deStr ) );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
-
- optionCombo = dataElementCategoryService.getDataElementCategoryOptionCombo( Integer
- .valueOf( optStr ) );
-
- DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, optionCombo );
-
- if ( dataValue == null )
- {
- if ( value != null )
- {
- dataValue = new DataValue( dataElement, period, source, value, storedBy, timeStamp, null,
- optionCombo );
-
- dataValueService.addDataValue( dataValue );
- }
- }
- else
- {
- dataValue.setValue( value );
-
- dataValue.setTimestamp( timeStamp );
-
- dataValue.setStoredBy( storedBy );
-
- dataValueService.updateDataValue( dataValue );
- }
- }
-
- System.out.println( importFile + " is Imported Successfully" );
-
- importStatus += "<br>" + new Date() + ": " + importFile + " is Imported Successfully.";
-
- mobileImportService.moveImportedFile( importFile );
- }
-
- return SUCCESS;
- }
-}
=== removed directory 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api'
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/DefaultMobileImportService.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/DefaultMobileImportService.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/DefaultMobileImportService.java 1970-01-01 00:00:00 +0000
@@ -1,397 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.api;
-
-/*
- * 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.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.hisp.dhis.external.location.LocationManager;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserStore;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class DefaultMobileImportService
- implements MobileImportService
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private LocationManager locationManager;
-
- public void setLocationManager( LocationManager locationManager )
- {
- this.locationManager = locationManager;
- }
-
- private UserStore userStore;
-
- public void setUserStore( UserStore userStore )
- {
- this.userStore = userStore;
- }
-
- private PeriodService periodService;
-
- public void setPeriodService( PeriodService periodService )
- {
- this.periodService = periodService;
- }
-
- // -------------------------------------------------------------------------
- // Services
- // -------------------------------------------------------------------------
-
- public User getUserInfo( String mobileNumber )
- {
-
- List<User> allUsers = new ArrayList<User>( userStore.getAllUsers() );
-
- User selectedUser = new User();
-
- for ( User user : allUsers )
- {
- if ( user.getPhoneNumber() != null && user.getPhoneNumber().equalsIgnoreCase( mobileNumber ) )
- selectedUser = user;
- }
-
- return selectedUser;
- }
-
- public Period getPeriodInfo( String startDate )
- throws Exception
- {
-
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
-
- //String convertedDate = dateFormat.format( startDate );
-
- List<Period> monthlyPeriods = new ArrayList<Period>( periodService
- .getPeriodsByPeriodType( new MonthlyPeriodType() ) );
-
- for ( Period period : monthlyPeriods )
- {
- String tempDate = dateFormat.format( period.getStartDate() );
-
- System.out.println(tempDate + " **** " + startDate );
-
- if ( tempDate.equalsIgnoreCase( startDate ) )
- {
- return period;
- }
- }
-
- return null;
-
- }
-
- public MobileImportParameters getParametersFromXML( String fileName )
- throws Exception
- {
- File importFile = locationManager.getFileForReading( fileName, "mi", "pending" );
-
- String mobileNumber;
- String smsTime;
- String startDate;
-
- String tempDeid;
- String tempDataValue;
-
- Map<String, Integer> dataValues = new HashMap<String, Integer>();
-
- MobileImportParameters mobileImportParameters = new MobileImportParameters();
-
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse( importFile );
- if ( doc == null )
- {
- System.out.println( "XML File Not Found at user home" );
- return null;
- }
-
- // To get Mobile Number
- NodeList sourceInfo = doc.getElementsByTagName( "source" );
- Element sourceInfoElement = (Element) sourceInfo.item( 0 );
- NodeList textsourceInfoNameList = sourceInfoElement.getChildNodes();
- mobileNumber = textsourceInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setMobileNumber( mobileNumber );
-
- // To get Period
- NodeList periodInfo = doc.getElementsByTagName( "period" );
- Element periodInfoElement = (Element) periodInfo.item( 0 );
- NodeList textperiodInfoNameList = periodInfoElement.getChildNodes();
- startDate = textperiodInfoNameList.item( 0 ).getNodeValue().trim();
-
- mobileImportParameters.setStartDate( startDate );
-
- // To get TimeStamp
- NodeList timeStampInfo = doc.getElementsByTagName( "timeStamp" );
- Element timeStampInfoElement = (Element) timeStampInfo.item( 0 );
- NodeList texttimeStampInfoNameList = timeStampInfoElement.getChildNodes();
- smsTime = texttimeStampInfoNameList.item( 0 ).getNodeValue().trim();
-
- System.out.println("In getParametersFromXML : "+ mobileNumber+" : "+startDate+" : "+smsTime);
-
- mobileImportParameters.setSmsTime( smsTime );
-
- NodeList listOfDataValues = doc.getElementsByTagName( "dataValue" );
- int totalDataValues = listOfDataValues.getLength();
- for ( int s = 0; s < totalDataValues; s++ )
- {
- Node dataValueNode = listOfDataValues.item( s );
- if ( dataValueNode.getNodeType() == Node.ELEMENT_NODE )
- {
- Element dataValueElement = (Element) dataValueNode;
-
- NodeList dataElementIdList = dataValueElement.getElementsByTagName( "dataElement" );
- Element dataElementElement = (Element) dataElementIdList.item( 0 );
- NodeList textdataElementIdList = dataElementElement.getChildNodes();
- tempDeid = textdataElementIdList.item( 0 ).getNodeValue().trim();
-
- NodeList valueList = dataValueElement.getElementsByTagName( "value" );
- Element valueElement = (Element) valueList.item( 0 );
- NodeList textValueElementList = valueElement.getChildNodes();
- tempDataValue = textValueElementList.item( 0 ).getNodeValue();
-
- String tempDeID = tempDeid ;
- Integer tempDV = Integer.parseInt( tempDataValue );
-
- System.out.println("In getParametersFromXML : "+ tempDeID + " : "+ tempDV );
-
- dataValues.put( tempDeID, tempDV );
- }
- }// end of for loop with s var
-
- mobileImportParameters.setDataValues( dataValues );
-
- }// try block end
- catch ( SAXParseException err )
- {
- System.out.println( "** Parsing error" + ", line " + err.getLineNumber() + ", uri " + err.getSystemId() );
- System.out.println( " " + err.getMessage() );
- }
- catch ( SAXException e )
- {
- Exception x = e.getException();
- ((x == null) ? e : x).printStackTrace();
- }
- catch ( Throwable t )
- {
- t.printStackTrace();
- }
-
- return mobileImportParameters;
-
- }// getParametersFromXML end
-
- public List<String> getImportFiles()
- {
- List<String> fileNames = new ArrayList<String>();
-
- try
- {
- String importFolderPath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator
- + "mi" + File.separator + "pending";
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- importFolderPath = newpath + File.separator + "mi" + File.separator
- + "pending";
- }
-
- File dir = new File( importFolderPath );
-
- System.out.println(dir.getAbsolutePath());
-
- System.out.println(dir.listFiles());
-
- String[] files = dir.list();
-
- System.out.println("In getImportFiles Method: "+ files.length);
-
- fileNames = Arrays.asList( files );
- System.out.println("In getImportFiles Method: "+ fileNames.size());
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
-
- return fileNames;
- }
-
- public int moveFile( File source, File dest )
- throws IOException
- {
-
- if ( !dest.exists() )
- {
- dest.createNewFile();
- }
-
- InputStream in = null;
-
- OutputStream out = null;
-
- try
- {
-
- in = new FileInputStream( source );
-
- out = new FileOutputStream( dest );
-
- byte[] buf = new byte[1024];
-
- int len;
-
- while ( (len = in.read( buf )) > 0 )
- {
- out.write( buf, 0, len );
- }
- }
-
- catch( Exception e )
- {
- return -1;
- }
-
- finally
- {
- in.close();
-
- out.close();
- }
-
- return 1;
-
- }
-
- public void moveImportedFile( String fileName )
- {
- try
- {
- String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "pending" + File.separator + fileName;
-
- String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "completed" + File.separator + fileName;
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
- + fileName;
-
- System.out.println(sourceFilePath);
-
- destFilePath = newpath + File.separator + "mi" + File.separator + "completed" + File.separator
- + fileName;
-
- System.out.println(destFilePath);
-
- }
-
- File sourceFile = new File( sourceFilePath );
-
- File destFile = new File( destFilePath );
-
- int status = moveFile( sourceFile, destFile );
-
- if( status == 1 )
- sourceFile.delete();
-
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
-
- }
-
- public void moveFailedFile( String fileName )
- {
- try
- {
- String sourceFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "pending" + File.separator + fileName;
-
- String destFilePath = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + "mi"
- + File.separator + "bounced" + File.separator + fileName;
-
- String newpath = System.getenv( "DHIS2_HOME" );
- if ( newpath != null )
- {
- sourceFilePath = newpath + File.separator + "mi" + File.separator + "pending" + File.separator
- + fileName;
-
- destFilePath = newpath + File.separator + "mi" + File.separator + "bounced" + File.separator
- + fileName;
- }
-
- File sourceFile = new File( sourceFilePath );
-
- File destFile = new File( destFilePath );
-
- int status = moveFile( sourceFile, destFile );
-
- if( status == 1 )
- sourceFile.delete();
-
- }
- catch ( Exception e )
- {
- System.out.println( e.getMessage() );
- }
- }
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportParameters.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportParameters.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportParameters.java 1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.api;
-
-/*
- * 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.io.Serializable;
-import java.util.Map;
-
-@SuppressWarnings("serial")
-public class MobileImportParameters implements Serializable
-{
-
- private String mobileNumber;
-
- private String startDate;
-
- private String smsTime;
-
- private Map<String, Integer> dataValues;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public MobileImportParameters()
- {
-
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public String getMobileNumber()
- {
- return mobileNumber;
- }
-
- public void setMobileNumber( String mobileNumber )
- {
- this.mobileNumber = mobileNumber;
- }
-
- public String getStartDate()
- {
- return startDate;
- }
-
- public void setStartDate( String startDate )
- {
- this.startDate = startDate;
- }
-
- public String getSmsTime()
- {
- return smsTime;
- }
-
- public void setSmsTime( String smsTime )
- {
- this.smsTime = smsTime;
- }
-
- public Map<String, Integer> getDataValues()
- {
- return dataValues;
- }
-
- public void setDataValues( Map<String, Integer> dataValues )
- {
- this.dataValues = dataValues;
- }
-
-
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportService.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportService.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportService.java 1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.api;
-
-/*
- * 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.List;
-
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.user.User;
-
-public interface MobileImportService
-{
-
- public MobileImportParameters getParametersFromXML( String fileName ) throws Exception;
-
- public User getUserInfo( String mobileNumber );
-
- public Period getPeriodInfo( String startDate ) throws Exception;
-
- public List<String> getImportFiles( );
-
- public void moveImportedFile( String fileName );
-
- public void moveFailedFile( String fileName );
-
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportStore.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportStore.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MobileImportStore.java 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.api;
-
-/*
- * 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.
- */
-
-public interface MobileImportStore
-{
-}
=== removed file 'local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MySQLMobileImportStore.java'
--- local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MySQLMobileImportStore.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/java/org/hisp/dhis/sandbox/mobileimport/api/MySQLMobileImportStore.java 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-package org.hisp.dhis.sandbox.mobileimport.api;
-
-/*
- * 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.
- */
-
-public class MySQLMobileImportStore
-{
-}
=== removed directory 'local/in/dhis-web-mobile/src/main/resources'
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/META-INF'
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/META-INF/dhis'
=== removed file 'local/in/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 2010-09-10 11:35:58 +0000
+++ local/in/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
@@ -1,48 +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.sandbox.mobileimport.action.MobileHomePageAction"
- class="org.hisp.dhis.sandbox.mobileimport.action.MobileHomePageAction"
- scope="prototype">
- </bean>
-
- <!-- Mobile Importing -->
- <bean id="org.hisp.dhis.sandbox.mobileimport.api.MobileImportService"
- class="org.hisp.dhis.sandbox.mobileimport.api.DefaultMobileImportService"
- scope="prototype">
- <property name="locationManager">
- <ref bean="org.hisp.dhis.external.location.LocationManager"/>
- </property>
- <property name="userStore">
- <ref bean="org.hisp.dhis.user.UserStore"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.sandbox.mobileimport.action.MobileImportProcessAction"
- class="org.hisp.dhis.sandbox.mobileimport.action.MobileImportProcessAction"
- scope="prototype">
- <property name="mobileImportService">
- <ref bean="org.hisp.dhis.sandbox.mobileimport.api.MobileImportService"/>
- </property>
- <property name="userStore">
- <ref bean="org.hisp.dhis.user.UserStore"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataValueService">
- <ref bean="org.hisp.dhis.datavalue.DataValueService"/>
- </property>
- <property name="dataElementCategoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </bean>
-
-
-
-</beans>
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/org'
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/org/hisp'
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/org/hisp/dhis'
=== removed directory 'local/in/dhis-web-mobile/src/main/resources/org/hisp/dhis/sandbox'
=== removed file 'local/in/dhis-web-mobile/src/main/resources/struts.xml'
--- local/in/dhis-web-mobile/src/main/resources/struts.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000
@@ -1,30 +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>
- <!-- use the DHIS web portal default -->
- <include file="dhis-web-commons.xml"/>
-
- <package name="dhis-web-mobile" extends="dhis-web-commons" namespace="/dhis-web-mobile">
-
- <action name="index" class="org.hisp.dhis.sandbox.mobileimport.action.MobileHomePageAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/welcome.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- </action>
-
-
- <!-- Process Mobile Importing -->
- <action name="processMobileImport"
- class="org.hisp.dhis.sandbox.mobileimport.action.MobileImportProcessAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-mobile/mobileImportingResult.vm</param>
- <param name="menu">/dhis-web-mobile/menu.vm</param>
- <param name="stylesheets">css/StylesForTags.css</param>
- </action>
-
-
-
- </package>
-</struts>
=== removed directory 'local/in/dhis-web-mobile/src/main/webapp'
=== removed directory 'local/in/dhis-web-mobile/src/main/webapp/WEB-INF'
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000
@@ -1,60 +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 Mobile Import</display-name>
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
- </context-param>
- <context-param>
- <param-name>automaticAccessType</param-name>
- <param-value>ghostAdmin</param-value>
- </context-param>
-
- <filter>
- <filter-name>RedirectFilter</filter-name>
- <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
- <init-param>
- <param-name>redirectPath</param-name>
- <param-value>dhis-web-mobile/index.action</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>OpenSessionInViewFilter</filter-name>
- <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
- </filter>
- <filter>
- <filter-name>filterChainProxy</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- </filter>
- <filter>
- <filter-name>Struts</filter-name>
- <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>RedirectFilter</filter-name>
- <url-pattern>/</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>OpenSessionInViewFilter</filter-name>
- <url-pattern>*.action</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>filterChainProxy</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>Struts</filter-name>
- <url-pattern>*.action</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
- <listener>
- <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
- </listener>
-</web-app>
=== removed directory 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile'
=== removed directory 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css'
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/StylesForTags.css'
--- local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/StylesForTags.css 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/StylesForTags.css 1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-.Heading {
- font-family: times,arial, georgia, tahoma;
- font-size: 35px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.Normal {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- white-space: nowrap;
- cursor: default;
- text-align: center;
-}
-
-.NormalB {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.TableDataCellStyles {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- white-space: nowrap;
- cursor: default;
- text-align: center;
- border:1px dotted #C0C0C0;
-}
-
-.TableHeadingCellStyles {
- font-family: arial, georgia, tahoma;
- font-size: 11px;
- white-space: nowrap;
- cursor: default;
-}
-
-.DefaultFontStyles {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.DefaultFontStylesNoBold {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- white-space: nowrap;
- cursor: default;
-}
-
-
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/stylesForReports.css'
--- local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/stylesForReports.css 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/css/stylesForReports.css 1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-
-
-.reportheading {
- font-family: arial, georgia, tahoma;
- font-size: 17px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.reportheadingwithunderline {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.reportsubheading {
- font-family: arial, georgia, tahoma;
- font-size: 15px;
- font-weight: bold;
- white-space: nowrap;
- cursor: default;
-}
-
-.tableheading1 {
- font-family: arial, georgia, tahoma;
- font-size: 13px;
- font-weight: bold;
- cursor: default;
-}
-
-.tabledata1 {
- font-family: arial, georgia, tahoma;
- font-size: 12px;
- cursor: default;
-}
-
-.tableheading2 {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- font-weight: bold;
- cursor: default;
-}
-
-.tabledata2 {
- font-family: arial, georgia, tahoma;
- font-size: 10px;
- cursor: default;
-}
-
-#dropmenudiv{
- position:absolute;
- border:1px solid black;
- border-bottom-width: 0;
- font:normal 12px Verdana;
- line-height:18px;
- z-index:100;
- }
-
- #dropmenudiv a{
- width: 100%;
- display: block;
- text-indent: 3px;
- border-bottom: 1px solid black;
- padding: 1px 0;
- text-decoration: none;
- font-weight: bold;
- }
-
- #dropmenudiv a:hover{ /*hover background color*/
- background-color: yellow;
- }
=== removed directory 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript'
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/menu.vm'
--- local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/menu.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/menu.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<h2>Mobile Importing</h2>
-<ul>
- <!--<li>Report Analysis</li>-->
- <ul>
- <li>
- <a href = "processMobileImport.action">Start Mobile Data Import</a>
- </li>
-
- </ul>
-</ul>
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm'
--- local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/mobileImportingResult.vm 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-
-<div align="center">
-$importStatus
-</div>
\ No newline at end of file
=== removed file 'local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/welcome.vm'
--- local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/welcome.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-mobile/src/main/webapp/dhis-web-mobile/welcome.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
- <font face"Arial" color="blue"><H1>Mobile Importing Home Page</H1></font>
\ No newline at end of file
