← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3479: Removed outdated module

 

------------------------------------------------------------
revno: 3479
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-04-27 19:17:37 +0200
message:
  Removed outdated module
removed:
  local/who/
  local/who/dhis-web-openhealth-integration/
  local/who/dhis-web-openhealth-integration/pom.xml
  local/who/dhis-web-openhealth-integration/src/
  local/who/dhis-web-openhealth-integration/src/main/
  local/who/dhis-web-openhealth-integration/src/main/java/
  local/who/dhis-web-openhealth-integration/src/main/java/org/
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/AddOlapURLToDashboardAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/BuildOlapURLAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DeleteOlapURLAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DisplayAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetAllOlapURLsAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLOptionsAction.java
  local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/SaveOlapURLAction.java
  local/who/dhis-web-openhealth-integration/src/main/resources/
  local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/
  local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis/
  local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis/beans.xml
  local/who/dhis-web-openhealth-integration/src/main/resources/org/
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module.properties
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_es_ES.properties
  local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_pt_PT.properties
  local/who/dhis-web-openhealth-integration/src/main/resources/struts.xml
  local/who/dhis-web-openhealth-integration/src/main/webapp/
  local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF/
  local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF/web.xml
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/buildViewForm.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/display.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript/
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript/view.js
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/menu.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseOlapURL.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseSuccess.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/saveViewForm.vm
  local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/viewForm.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/who'
=== removed directory 'local/who/dhis-web-openhealth-integration'
=== removed file 'local/who/dhis-web-openhealth-integration/pom.xml'
--- local/who/dhis-web-openhealth-integration/pom.xml	2009-09-06 15:51:11 +0000
+++ local/who/dhis-web-openhealth-integration/pom.xml	1970-01-01 00:00:00 +0000
@@ -1,39 +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.3-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>dhis-web-openhealth-integration</artifactId>
-  <packaging>war</packaging>
-  <name>DHIS OpenHealth integration</name>
-  
-  <build>
-    <finalName>dhis-web-openhealth-integration</finalName>
-  </build>
-  
-  <dependencies>
-    
-    <!-- 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-reporting</artifactId>
-    </dependency>
-    
-  </dependencies>
-</project>

=== removed directory 'local/who/dhis-web-openhealth-integration/src'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java/org'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/AddOlapURLToDashboardAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/AddOlapURLToDashboardAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/AddOlapURLToDashboardAction.java	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardService;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class AddOlapURLToDashboardAction
-    implements Action
-{
-    private static final Log log = LogFactory.getLog( AddOlapURLToDashboardAction.class );
-    
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private CurrentUserService currentUserService;
-
-    public void setCurrentUserService( CurrentUserService currentUserService )
-    {
-        this.currentUserService = currentUserService;
-    }
-
-    private DashboardService dashboardService;
-
-    public void setDashboardService( DashboardService dashboardService )
-    {
-        this.dashboardService = dashboardService;
-    }
-    
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        User user = currentUserService.getCurrentUser();
-        
-        if ( user != null )
-        {        
-            DashboardContent content = dashboardService.getDashboardContent( user );
-        
-            OlapURL url = olapURLService.getOlapURL( id );
-            
-            content.getOlapUrls().add( url );
-            
-            dashboardService.saveDashboardContent( content );
-            
-            log.info( "Added olap url '" + url.getName() + "' to dashboard for user '" + user.getName() + "'" );
-        }
-        else
-        {
-            log.warn( "Could not add olap url to dashboard, no current user" );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/BuildOlapURLAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/BuildOlapURLAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/BuildOlapURLAction.java	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.olap.OlapURLService;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.Action;
-
-import static org.hisp.dhis.util.ContextUtils.getBaseUrl;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class BuildOlapURLAction
-    implements Action
-{
-    private static final Log log = LogFactory.getLog( BuildOlapURLAction.class );
-    
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private String application;
-
-    public void setApplication( String application )
-    {
-        this.application = application;
-    }
-
-    private String cube;
-
-    public void setCube( String cube )
-    {
-        this.cube = cube;
-    }
-
-    private String indicator;
-
-    public void setIndicator( String indicator )
-    {
-        this.indicator = indicator;
-    }
-
-    private String period;
-
-    public void setPeriod( String period )
-    {
-        this.period = period;
-    }
-    
-    private String level;
-    
-    public void setLevel( String level )
-    {
-        this.level = level;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-     private String redirect;
-
-     public String getRedirect()
-     {
-         return redirect;
-     }
-     
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        String[] periodElements = period.split( " " );
-        String month = periodElements[0].substring( 0, 3 );
-        String year = periodElements[1];
-
-        String organisationUnit = organisationUnitService.getRootOrganisationUnits().iterator().next().getGeoCode();
-
-        String baseUrl = getBaseUrl( ServletActionContext.getRequest() );
-        
-        String queryString = olapURLService.getMapURL( application, cube, indicator, organisationUnit, year, month, level );
-        
-        String url = baseUrl + queryString;
-        
-        log.info( "URL: " + url );
-        
-        redirect = url;
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DeleteOlapURLAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DeleteOlapURLAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DeleteOlapURLAction.java	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DeleteOlapURLAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input / output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( id != null )
-        {
-            OlapURL url = olapURLService.getOlapURL( id );
-            
-            olapURLService.deleteOlapURL( url );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DisplayAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DisplayAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/DisplayAction.java	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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 static org.hisp.dhis.util.ContextUtils.getBaseUrl;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DisplayAction
-    extends ActionSupport
-{
-    private static final Log log = LogFactory.getLog( DisplayAction.class );
-    
-   // -------------------------------------------------------------------------
-   // Output
-   // -------------------------------------------------------------------------
-
-    private String redirect;
-
-    public String getRedirect()
-    {
-        return redirect;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        HttpServletRequest request = ServletActionContext.getRequest();
-
-        String query = request.getQueryString() != null ? request.getQueryString() : "";
-        
-        redirect = getBaseUrl( request ) + query;
-        
-        log.info( "Redirect path: " + redirect );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetAllOlapURLsAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetAllOlapURLsAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetAllOlapURLsAction.java	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-import org.hisp.dhis.olap.comparator.OlapURLNameComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetAllOlapURLsAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<OlapURL> urls;
-
-    public List<OlapURL> getUrls()
-    {
-        return urls;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        urls = new ArrayList<OlapURL>( olapURLService.getAllOlapURLs() );
-        
-        Collections.sort( urls, new OlapURLNameComparator() );
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLAction.java	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetOlapURLAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input / output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-    
-    private OlapURL url;
-
-    public OlapURL getUrl()
-    {
-        return url;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( id != null )
-        {
-            url = olapURLService.getOlapURL( id );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLOptionsAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLOptionsAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/GetOlapURLOptionsAction.java	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.comparator.PeriodComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetOlapURLOptionsAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private IndicatorService indicatorService;
-
-    public void setIndicatorService( IndicatorService indicatorService )
-    {
-        this.indicatorService = indicatorService;
-    }
-
-    private PeriodService periodService;
-
-    public void setPeriodService( PeriodService periodService )
-    {
-        this.periodService = periodService;
-    }
-
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    private I18nFormat format;
-
-    public void setFormat( I18nFormat format )
-    {
-        this.format = format;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private List<Indicator> availableIndicators;
-
-    public List<Indicator> getAvailableIndicators()
-    {
-        return availableIndicators;
-    }
-
-    private List<Period> availablePeriods;
-
-    public List<Period> getAvailablePeriods()
-    {
-        return availablePeriods;
-    }
-
-    private List<OrganisationUnitLevel> availableLevels;
-    
-    public List<OrganisationUnitLevel> getAvailableLevels()
-    {
-        return availableLevels;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        availableIndicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
-        availablePeriods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( new MonthlyPeriodType() ) );
-        availableLevels = organisationUnitService.getOrganisationUnitLevels();
-        
-        Collections.sort( availableIndicators, new IndicatorNameComparator() );
-        Collections.sort( availablePeriods, new PeriodComparator() );
-        
-        for ( Period period : availablePeriods )
-        {
-            period.setName( format.formatPeriod( period ) );
-        }
-        
-        return SUCCESS;
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/SaveOlapURLAction.java'
--- local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/SaveOlapURLAction.java	2010-04-12 21:23:33 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/java/org/hisp/dhis/openhealth/action/SaveOlapURLAction.java	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-package org.hisp.dhis.openhealth.action;
-
-/*
- * 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.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class SaveOlapURLAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private OlapURLService olapURLService;
-
-    public void setOlapURLService( OlapURLService olapURLService )
-    {
-        this.olapURLService = olapURLService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-    
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private String url;
-
-    public void setUrl( String url )
-    {
-        this.url = url;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        OlapURL olapURL = null;
-        
-        if ( id != null )
-        {
-            olapURL = olapURLService.getOlapURL( id );
-        }
-        else
-        {
-            olapURL = new OlapURL();
-        }
-                
-        olapURL.setName( name );
-        olapURL.setUrl( url );
-        
-        olapURLService.saveOlapURL( olapURL );
-        
-        return SUCCESS;
-    }
-}

=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/META-INF'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis/beans.xml'
--- local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis/beans.xml	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/resources/META-INF/dhis/beans.xml	1970-01-01 00:00:00 +0000
@@ -1,71 +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.openhealth.action.DisplayAction"
-    class="org.hisp.dhis.openhealth.action.DisplayAction"
-    scope="prototype">			
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.BuildOlapURLAction"
-    class="org.hisp.dhis.openhealth.action.BuildOlapURLAction"
-    scope="prototype">
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.GetAllOlapURLsAction"
-    class="org.hisp.dhis.openhealth.action.GetAllOlapURLsAction"
-    scope="prototype">
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.SaveOlapURLAction"
-    class="org.hisp.dhis.openhealth.action.SaveOlapURLAction"
-    scope="prototype">
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.GetOlapURLAction"
-    class="org.hisp.dhis.openhealth.action.GetOlapURLAction"
-    scope="prototype">
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.GetOlapURLOptionsAction"
-    class="org.hisp.dhis.openhealth.action.GetOlapURLOptionsAction"
-    scope="prototype">
-    <property name="indicatorService"
-      ref="org.hisp.dhis.indicator.IndicatorService"/>
-    <property name="periodService"
-      ref="org.hisp.dhis.period.PeriodService"/>
-    <property name="organisationUnitService"
-      ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.DeleteOlapURLAction"
-    class="org.hisp.dhis.openhealth.action.DeleteOlapURLAction"
-    scope="prototype">
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-  </bean>
-  
-  <bean id="org.hisp.dhis.openhealth.action.AddOlapURLToDashboardAction"
-    class="org.hisp.dhis.openhealth.action.AddOlapURLToDashboardAction"
-    scope="prototype">
-    <property name="currentUserService"
-      ref="org.hisp.dhis.user.CurrentUserService"/>
-    <property name="dashboardService"
-      ref="org.hisp.dhis.dashboard.DashboardService"/>
-    <property name="olapURLService"
-      ref="org.hisp.dhis.olap.OlapURLService"/>
-  </bean>
-    
-</beans>

=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/org'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module.properties'
--- local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module.properties	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module.properties	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-data_analysis 													= Data Analysis
-name 															= Name
-url 															= URL
-save 															= Save
-view 															= View
-home 															= Home
-list_view 														= List Views
-save_view 														= Save view
-edit 															= Edit
-remove 															= Remove
-operations 														= Operations
-add 															= Add
-cancel 															= Cancel
-confirm_remove_view 											= Are you sure you want to remove the view?
-select_indicator 												= Select indicator
-select_period													= Select period
-application_name												= Application name
-cube_name														= Cube name
-add_new															= Add new
-indicator														= Indicator
-period															= Period
-organisation_unit_level											= Organisation unit level
-select_level													= Select level
-indicator_map													= Indicator map
-show_details													= Show details
-add_to_dashboard												= Add to dashboard
-confirm_add_to_dashboard										= Are you sure you want to add this url to the dashboard?
\ No newline at end of file

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_es_ES.properties'
--- local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_es_ES.properties	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_es_ES.properties	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Sat May 16 13:17:47 GMT-05:00 2009
-organisation_unit_level=Nivel de la Unidad organizativa
-save_view=Guardar vista
-cancel=Cancelar
-url=URL
-data_analysis=Analisis de datos
-confirm_remove_view=Confirmar que quiere eliminar esta vista
-indicator=Indicador
-select_level=Seleccionar nivel
-view=Vista
-add_new=A\u00F1adir nuevo
-select_period=Seleccionar periodo
-add=A\u00F1adir
-show_details=Mostrar detalles
-edit=Editar
-confirm_add_to_dashboard=Confirmar a\u00F1adir este URL an Tablero
-cube_name=Nombre del cubo
-add_to_dashboard=A\u00F1adir al Tablero
-select_indicator=Seleccionar indicador
-operations=Operaciones
-period=Per\u00EDodo
-save=Guardar
-list_view=Lista de Vistas
-home=Inicio
-indicator_map=Mapa de indicador
-remove=Eliminar
-name=Nombre
-application_name=Nombre de la aplicaci\u00F3n

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_pt_PT.properties'
--- local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_pt_PT.properties	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/resources/org/hisp/dhis/openhealth/i18n_module_pt_PT.properties	1970-01-01 00:00:00 +0000
@@ -1,998 +0,0 @@
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:59:20 CAT 2009
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:59:26 CAT 2009
-add_new=Adicionar novo
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:59:38 CAT 2009
-add_new=Adicionar novo
-application_name=Nome aplica\u00E7\u00E3o
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 20:59:44 CAT 2009
-add_new=Adicionar novo
-application_name=Nome aplica\u00E7\u00E3o
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:05 CAT 2009
-add_new=Adicionar novo
-application_name=Nome aplica\u00E7\u00E3o
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:12 CAT 2009
-add_new=Adicionar novo
-cube_name=Nome cubo
-application_name=Nome aplica\u00E7\u00E3o
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:22 CAT 2009
-add_new=Adicionar novo
-cube_name=Nome cubo
-application_name=Nome aplica\u00E7\u00E3o
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-cancel=Cancelar
-add=Adicionar
-data_analysis=Analise de dados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:27 CAT 2009
-add_new=Adicionar novo
-cube_name=Nome cubo
-application_name=Nome aplica\u00E7\u00E3o
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-cancel=Cancelar
-edit=Editar
-add=Adicionar
-data_analysis=Analise de dados
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:34 CAT 2009
-data_analysis=Analise de dados
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-home=
-cube_name=Nome cubo
-edit=Editar
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:42 CAT 2009
-data_analysis=Analise de dados
-list_view=
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:51 CAT 2009
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:52 CAT 2009
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:52 CAT 2009
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:52 CAT 2009
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:00:57 CAT 2009
-name=Nome
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:04 CAT 2009
-operations=Opera\u00E7\u00F5es
-name=Nome
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:24 CAT 2009
-operations=Opera\u00E7\u00F5es
-name=Nome
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:32 CAT 2009
-operations=Opera\u00E7\u00F5es
-name=Nome
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-indicator_map=Mapa indicador
-home=
-period=Per\u00EDodo
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:38 CAT 2009
-operations=Opera\u00E7\u00F5es
-name=Nome
-data_analysis=Analise de dados
-list_view=Listar visualiza\u00E7\u00F5es
-application_name=Nome aplica\u00E7\u00E3o
-add_new=Adicionar novo
-remove=Remover
-indicator_map=Mapa indicador
-home=
-period=Per\u00EDodo
-cube_name=Nome cubo
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-edit=Editar
-indicator=Indicador
-cancel=Cancelar
-add=Adicionar
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:45 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-add_new=Adicionar novo
-add=Adicionar
-edit=Editar
-cube_name=Nome cubo
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:01:54 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-add_new=Adicionar novo
-add=Adicionar
-edit=Editar
-cube_name=Nome cubo
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:02:03 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-add_new=Adicionar novo
-add=Adicionar
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:02:11 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-add_new=Adicionar novo
-add=Adicionar
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:02:19 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:02:26 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-period=Per\u00EDodo
-operations=Opera\u00E7\u00F5es
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:02:34 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:03:20 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:03:43 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:03:53 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:03:59 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:05 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:23 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:37 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:42 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:51 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:04:56 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:05:03 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:05:10 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:05:43 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:05:52 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:08 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:19 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:23 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:24 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:32 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:40 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:48 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:06:59 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=
-indicator_map=Mapa indicador
-remove=Remover
-name=Nome
-application_name=Nome aplica\u00E7\u00E3o
-#Resource generated by I18n Resource Editor
-#Sun Jan 11 21:07:08 CAT 2009
-organisation_unit_level=N\u00EDvel da Unidade Organizacional
-save_view=Gravar visualiza\u00E7\u00E3o
-cancel=Cancelar
-url=
-data_analysis=Analise de dados
-confirm_remove_view=Tem a certeza que quer remover esta visualiza\u00E7\u00E3o?
-indicator=Indicador
-select_level=Seleccionar n\u00EDvel
-view=Ver
-add_new=Adicionar novo
-select_period=Seleccionar per\u00EDodo
-add=Adicionar
-show_details=Mostrar detalhes
-edit=Editar
-cube_name=Nome cubo
-select_indicator=Seleccionar indicador
-operations=Opera\u00E7\u00F5es
-period=Per\u00EDodo
-save=Gravar
-list_view=Listar visualiza\u00E7\u00F5es
-home=

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/resources/struts.xml'
--- local/who/dhis-web-openhealth-integration/src/main/resources/struts.xml	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/resources/struts.xml	1970-01-01 00:00:00 +0000
@@ -1,65 +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-openhealth-integration" extends="dhis-web-commons" namespace="/dhis-web-openhealth-integration">
-	
-	<action name="index" class="org.hisp.dhis.openhealth.action.DisplayAction">
-      <result name="success" type="redirect">getAllOlapURLs.action</result>
-	</action>	
-		
-	<action name="display" class="org.hisp.dhis.openhealth.action.DisplayAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-openhealth-integration/display.vm</param>
-	  <param name="menu">/dhis-web-openhealth-integration/menu.vm</param>
-    </action>
-	    
-    <action name="getAllOlapURLs" class="org.hisp.dhis.openhealth.action.GetAllOlapURLsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-openhealth-integration/viewForm.vm</param>
-      <param name="menu">/dhis-web-openhealth-integration/menu.vm</param>
-      <param name="javascripts">javascript/view.js</param>
-    </action>
-    
-    <action name="saveOlapURL" class="org.hisp.dhis.openhealth.action.SaveOlapURLAction">
-      <result name="success" type="redirect">getAllOlapURLs.action</result>
-    </action>
-    
-    <action name="buildOlapURL" class="org.hisp.dhis.openhealth.action.BuildOlapURLAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-openhealth-integration/display.vm</param>
-      <param name="menu">/dhis-web-openhealth-integration/menu.vm</param>
-    </action>
-    
-    <action name="displaySaveOlapURLForm" class="org.hisp.dhis.openhealth.action.GetOlapURLAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-openhealth-integration/saveViewForm.vm</param>
-      <param name="menu">/dhis-web-openhealth-integration/menu.vm</param>
-    </action>
-    
-    <action name="displayBuildOlapURLForm" class="org.hisp.dhis.openhealth.action.GetOlapURLOptionsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-openhealth-integration/buildViewForm.vm</param>
-      <param name="menu">/dhis-web-openhealth-integration/menu.vm</param>
-    </action>
-    
-    <action name="deleteOlapURL" class="org.hisp.dhis.openhealth.action.DeleteOlapURLAction">
-      <result name="success" type="redirect">getAllOlapURLs.action</result>
-    </action>
-    
-    <action name="getOlapURL" class="org.hisp.dhis.openhealth.action.GetOlapURLAction">
-      <result name="success" type="velocity-xml">/dhis-web-openhealth-integration/responseOlapURL.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="addOlapUrlToDashboard" class="org.hisp.dhis.openhealth.action.AddOlapURLToDashboardAction">
-      <result name="success" type="velocity-xml">/dhis-web-openhealth-integration/responseSuccess.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-  </package>
-</struts>

=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/webapp'
=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF/web.xml'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF/web.xml	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/WEB-INF/web.xml	1970-01-01 00:00:00 +0000
@@ -1,64 +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 OpenHealth integration</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-openhealth-integration/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>SecurityFilterChain</filter-name>
-    <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
-    <init-param>
-      <param-name>targetBean</param-name>
-      <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
-    </init-param>
-  </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>SecurityFilterChain</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/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/buildViewForm.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/buildViewForm.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/buildViewForm.vm	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-
-<h3>$i18n.getString( "indicator_map" )</h3>
-
-<form action="buildOlapURL.action" method="post">
-
-<input type="hidden" name="id" value="$!url.id">
-
-<table>
-	<colgroup>
-		<col width="150">
-		<col width="300">
-	</colgroup>
-    <tr>
-    	<td>$i18n.getString( "application_name" )</td>
-        <td><input type="text" name="application" value="openhealth-fp" style="width:300px"></td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "cube_name" )</td>
-        <td>
-        	<select id="cube" name="cube" style="width:300px">
-        	   <option value="ind_ou2">ind_ou2</option>
-        	   <option value="ind_ou3" selected>ind_ou3</option>
-               <option value="ind_ou4">ind_ou4</option>
-               <option value="ind_ou5">ind_ou5</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-    	<td>$i18n.getString( "indicator" )</td>
-        <td>
-        	<select name="indicator" style="min-width:300px">
-        		<option value="null">[$i18n.getString( "select_indicator" )]</option>
-        		#foreach ( $indicator in $availableIndicators )
-        			<option value="$encoder.htmlEncode( $indicator.shortName )">$encoder.htmlEncode( $indicator.name )</option>
-		        #end
-	        </select>
-        </td>
-    </tr>
-    <tr>
-    	<td>$i18n.getString( "period" )</td>
-    	<td>
-    		<select name="period" style="min-width:300px">
-    			<option value="null">[$i18n.getString( "select_period" )]</option>
-    			#foreach ( $period in $availablePeriods )
-    				<option value="$encoder.htmlEncode( $period.name )">$encoder.htmlEncode( $period.name )</option>
-			    #end
-		    </select>
-	    </td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "organisation_unit_level" )</td>
-        <td>
-            <select name="level" style="min-width:300px">
-                <option value="null">[$i18n.getString( "select_level" )]</option>
-                #foreach ( $level in $availableLevels )
-                    <option value="OrgUnit${level.level}">$encoder.htmlEncode( $level.name )</option>
-                #end
-            </select>
-        </td>
-    </tr>
-    <tr>
-    	<td></td>
-    	<td>
-    		<input type="submit" value="$i18n.getString( 'view' )" style="width:10em">
-	    </td>
-    </tr>
-    
-</table>

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/display.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/display.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/display.vm	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-
-#if( $redirect )
-	
-	<iframe id="frame" src="${redirect}" style="width:100%; height:100%; min-height: 500px; border-width:0px"></iframe>
-	
-	<script type="text/javascript">
-		
-		var paddingTop = document.getElementById( "frame" ).offsetTop;
-		
-		var windowHeight = window.innerHeight;
-		
-		var frameHeight = windowHeight - paddingTop - 15;
-		
-		// Set frame height to fit browser window
-		
-		document.getElementById( "frame" ).style.height = frameHeight +"px";
-		
-</script>
-	
-#end

=== removed directory 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript'
=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript/view.js'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript/view.js	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/javascript/view.js	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-
-// -----------------------------------------------------------------------------
-// View details
-// -----------------------------------------------------------------------------
-
-function showOlapURLDetails( id )
-{
-    var request = new Request();
-    request.setResponseTypeXML( 'url' );
-    request.setCallbackSuccess( olapURLReceived );
-    request.send( 'getOlapURL.action?id=' + id );
-}
-
-function olapURLReceived( xmlObject )
-{
-    setFieldValue( 'nameField', getElementValue( xmlObject, 'name' ) );
-    setFieldValue( 'urlField', getElementValue( xmlObject, 'url' ) );
-    
-    showDetails();
-}
-
-// -----------------------------------------------------------------------------
-// Remove
-// -----------------------------------------------------------------------------
-
-function removeView( viewId )
-{
-	var dialog = confirm( i18n_confirm_remove_view );
-	
-	if ( dialog )
-	{
-		window.location.href = "deleteOlapURL.action?id=" + viewId;
-	}
-}
-
-// -----------------------------------------------------------------------------
-// Dashboard
-// -----------------------------------------------------------------------------
-
-function addToDashboard( id )
-{
-    var dialog = window.confirm( i18n_confirm_add_to_dashboard );
-    
-    if ( dialog )
-    {
-        var request = new Request(); 
-        request.send( "addOlapUrlToDashboard.action?id=" + id );
-    }
-}

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/menu.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/menu.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/menu.vm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-
-<h2>$i18n.getString( "data_analysis" )&nbsp;</h2>
-
-<ul>
-	<li><a href="getAllOlapURLs.action">$i18n.getString( "view" )&nbsp;</a></li>
-	<li><a href="displayBuildOlapURLForm.action">$i18n.getString( "indicator_map" )&nbsp;</a></li>
-</ul>

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseOlapURL.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseOlapURL.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseOlapURL.vm	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<url>
-	<name>$encoder.xmlEncode( $url.name )</name>
-	<url>$encoder.xmlEncode( $url.url )</url>
-</url>
\ No newline at end of file

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseSuccess.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseSuccess.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/responseSuccess.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="success">$encoder.xmlEncode( $message )</message>

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/saveViewForm.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/saveViewForm.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/saveViewForm.vm	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-
-<h3>$i18n.getString( "save_view" )</h3>
-
-<form action="saveOlapURL.action" method="post">
-
-<input type="hidden" name="id" value="$!url.id">
-
-<table>
-	<tr>
-		<td>$i18n.getString( "name" )</td>
-		<td><input type="text" name="name" value="$!url.name" style="width:400px"></td>
-	</tr>
-	<tr>
-		<td>$i18n.getString( "url" )</td>
-		<td><textarea name="url" style="width:400px; height:120px;">$!url.url</textarea></td>
-	</tr>
-	<tr>
-		<td></td>
-		<td><input type="submit" value="$i18n.getString( 'save' )" style="width:50%"><input 
-			type="button" value="$i18n.getString( 'cancel' )" style="width:50%" 
-			onclick="window.location.href='getAllOlapURLs.action'"></td>
-	</tr>
-</table>
-
-</form>

=== removed file 'local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/viewForm.vm'
--- local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/viewForm.vm	2009-09-04 17:28:51 +0000
+++ local/who/dhis-web-openhealth-integration/src/main/webapp/dhis-web-openhealth-integration/viewForm.vm	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-
-<h3>$i18n.getString( "view" )</h3>
-
-<table class="mainPageTable">
-	<tr>
-        <td style="vertical-align:top">
-        	<table class="listTable">
-				<col>
-			    <col width="20">
-			    <col width="20">
-			    <col width="20">
-                <col width="20">
-                <col width="20">
-			    <tr>
-			    	<td colspan="6" style="text-align:right">
-			    		<input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:window.location.href='displaySaveOlapURLForm.action'">
-	    			</td>
-    			</tr>
-				<tr>
-					<th>$i18n.getString( "name" )</th>
-					<th colspan="5">$i18n.getString( "operations" )</th>
-				</tr>
-				<tbody>
-                #set( $mark = false )
-				#foreach ( $url in $urls )
-				<tr>
-					<td#alternate( $mark )>$url.name</td>
-					<td style="text-align:center"#alternate( $mark )><a href="display.action?$url.url" title="$i18n.getString( 'open' )"><img src="../images/open.png" alt="$i18n.getString( 'open' )"></a></td>
-					<td style="text-align:center"#alternate( $mark )><a href="displaySaveOlapURLForm.action?id=$url.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a></td>
-					<td style="text-align:center"#alternate( $mark )><a href="javascript:removeView( $url.id )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a></td>
-                    <td style="text-align:center"#alternate( $mark )><a href="javascript:addToDashboard( '$url.id' )" title="$i18n.getString( 'add_to_dashboard' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'add_to_dashboard' )"></a></td>
-                    <td style="text-align:center"#alternate( $mark )><a href="javascript:showOlapURLDetails( $url.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>
-				</tr>
-				    #if( $mark )
-                        #set( $mark = false )
-                    #else
-                        #set( $mark = true )
-                    #end
-				#end
-				</tbody>
-			</table>
-		</td>
-        <td style="width:20em; padding-left:2em; vertical-align:top">
-
-            <div id="detailsArea" style="display:none">
-                <div style="float:right">
-                    <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-                </div>
-                <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-                <p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
-            </div>
-
-        </td>
-    </tr>
-</table>
-
-<script type="text/javascript">
-	var i18n_confirm_remove_view = '$encoder.jsEscape( $i18n.getString( "confirm_remove_view" ) , "'")';
-	var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
-</script>