dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11802
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3463: Removed outdated object OlapUrl
------------------------------------------------------------
revno: 3463
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-04-24 14:47:31 +0200
message:
Removed outdated object OlapUrl
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURL.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURLService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator/OlapURLNameComparator.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OlapUrlConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/OlapUrlContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap/
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap/DefaultOlapURLService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLServiceTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLStoreTest.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveOlapUrlAction.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.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
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java 2011-04-24 12:47:31 +0000
@@ -57,6 +57,5 @@
USER,
REPORTTABLE,
REPORT,
- CHART,
- OLAPURL
+ CHART
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java 2011-01-21 16:22:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java 2011-04-24 12:47:31 +0000
@@ -32,7 +32,6 @@
import org.hisp.dhis.document.Document;
import org.hisp.dhis.mapping.MapView;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.report.Report;
import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.user.User;
@@ -51,8 +50,6 @@
private List<Report> reports = new ArrayList<Report>();
- private List<OlapURL> olapUrls = new ArrayList<OlapURL>();
-
private List<Document> documents = new ArrayList<Document>();
private List<ReportTable> reportTables = new ArrayList<ReportTable>();
@@ -111,19 +108,6 @@
}
}
}
-
- public void addOlapUrl( OlapURL url )
- {
- if ( !olapUrls.contains( url ) )
- {
- olapUrls.add( 0, url );
-
- while ( olapUrls.size() > MAX_DASHBOARD_ELEMENTS )
- {
- olapUrls.remove( MAX_DASHBOARD_ELEMENTS );
- }
- }
- }
public void addDocument( Document document )
{
@@ -198,16 +182,6 @@
this.reports = reports;
}
- public List<OlapURL> getOlapUrls()
- {
- return olapUrls;
- }
-
- public void setOlapUrls( List<OlapURL> olapUrls )
- {
- this.olapUrls = olapUrls;
- }
-
public List<Document> getDocuments()
{
return documents;
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURL.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURL.java 2011-04-01 09:57:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURL.java 1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-package org.hisp.dhis.olap;
-
-/*
- * 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.common.AbstractIdentifiableObject;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapURL
- extends AbstractIdentifiableObject
-{
- private String url;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public OlapURL()
- {
- }
-
- public OlapURL( String name, String url )
- {
- this.name = name;
- this.url = url;
- }
-
- // -------------------------------------------------------------------------
- // Equals and hashCode
- // -------------------------------------------------------------------------
-
- @Override
- public int hashCode()
- {
- final int PRIME = 31;
-
- int result = 1;
-
- result = PRIME * result + ((name == null) ? 0 : name.hashCode());
- result = PRIME * result + ((url == null) ? 0 : url.hashCode());
-
- return result;
- }
-
- @Override
- public boolean equals( Object obj )
- {
- if ( this == obj )
- {
- return true;
- }
-
- if ( obj == null )
- {
- return false;
- }
-
- if ( getClass() != obj.getClass() )
- {
- return false;
- }
-
- final OlapURL other = (OlapURL) obj;
-
- if ( name == null )
- {
- if ( other.name != null )
- {
- return false;
- }
- }
- else if ( !name.equals( other.name ) )
- {
- return false;
- }
- if ( url == null )
- {
- if ( other.url != null )
- {
- return false;
- }
- }
- else if ( !url.equals( other.url ) )
- {
- return false;
- }
-
- return true;
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public String getUrl()
- {
- return url;
- }
-
- public void setUrl( String url )
- {
- this.url = url;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURLService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURLService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/OlapURLService.java 1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-package org.hisp.dhis.olap;
-
-/*
- * 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.Collection;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface OlapURLService
-{
- String ID = OlapURLService.class.getName();
-
- /**
- * Returns a mapping URL.
- *
- * @param application the application name.
- * @param cube the cube name.
- * @param indicator the indicator name.
- * @param organisationUnit the organisation unit name.
- * @param year the year.
- * @param month the month.
- * @param level the organisation unit level.
- * @return a mapping URL.
- */
- String getMapURL( String application, String cube, String indicator,
- String organisationUnit, String year, String month, String level );
-
- int saveOlapURL( OlapURL olapURL );
-
- void updateOlapURL( OlapURL olapURL );
-
- OlapURL getOlapURL( int id );
-
- Collection<OlapURL> getOlapURLs( Collection<Integer> identifiers );
-
- void deleteOlapURL( OlapURL olapURL );
-
- Collection<OlapURL> getAllOlapURLs();
-
- OlapURL getOlapURLByName( String name );
-}
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator/OlapURLNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator/OlapURLNameComparator.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/olap/comparator/OlapURLNameComparator.java 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-package org.hisp.dhis.olap.comparator;
-
-/*
- * 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.Comparator;
-
-import org.hisp.dhis.olap.OlapURL;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapURLNameComparator
- implements Comparator<OlapURL>
-{
- public int compare( OlapURL url1, OlapURL url2 )
- {
- return url1.getName().compareTo( url2.getName() );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-04-24 12:47:31 +0000
@@ -88,6 +88,8 @@
executeSql( "DROP TABLE reportreporttables" );
executeSql( "DROP TABLE frequencyoverrideassociation" );
executeSql( "DROP TABLE dataelement_dataelementgroupsetmembers" );
+ executeSql( "DROP TABLE dashboardcontent_olapurls" );
+ executeSql( "DROP TABLE olapurl" );
executeSql( "ALTER TABLE dataelementcategoryoption drop column categoryid" );
executeSql( "ALTER TABLE reporttable DROP column dimension_type" );
executeSql( "ALTER TABLE reporttable DROP column dimensiontype" );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2011-02-02 17:56:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java 2011-04-24 12:47:31 +0000
@@ -105,8 +105,6 @@
void importCharts();
- void importOlapURLs();
-
void importCompleteDataSetRegistrations();
void importDataValues();
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java 2011-04-24 12:47:31 +0000
@@ -107,7 +107,6 @@
import org.hisp.dhis.jdbc.batchhandler.OrganisationUnitGroupMemberBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.PeriodBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ReportTableBatchHandler;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -254,13 +253,6 @@
this.chartService = chartService;
}
- private OlapURLService olapURLService;
-
- public void setOlapURLService( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
private AggregatedDataValueService aggregatedDataValueService;
public void setAggregatedDataValueService( AggregatedDataValueService aggregatedDataValueService )
@@ -911,16 +903,6 @@
log.info( "Imported Charts" );
}
- else if ( reader.isStartElement( OlapUrlConverter.COLLECTION_NAME ) )
- {
- state.setMessage( "importing_olap_urls" );
-
- XMLConverter converter = new OlapUrlConverter( importObjectService, olapURLService );
-
- converterInvoker.invokeRead( converter, reader, params );
-
- log.info( "Imported OlapURLs" );
- }
else if ( reader.isStartElement( CompleteDataSetRegistrationConverter.COLLECTION_NAME )
&& params.isDataValues() )
{
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OlapUrlConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OlapUrlConverter.java 2010-05-29 16:06:56 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OlapUrlConverter.java 1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-package org.hisp.dhis.importexport.dxf.converter;
-
-/*
- * 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.Collection;
-import java.util.Map;
-
-import org.amplecode.staxwax.reader.XMLReader;
-import org.amplecode.staxwax.writer.XMLWriter;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.ImportObjectService;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
-import org.hisp.dhis.importexport.importer.OlapUrlImporter;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapUrlConverter
- extends OlapUrlImporter implements XMLConverter
-{
- public static final String COLLECTION_NAME = "olapUrls";
- public static final String ELEMENT_NAME = "olapUrl";
-
- private static final String FIELD_ID = "id";
- private static final String FIELD_NAME = "name";
- private static final String FIELD_URL = "url";
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- /**
- * Constructor for write operations.
- */
- public OlapUrlConverter( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
- /**
- * Constructor for read operations.
- *
- * @param importObjectService the importObjectService to use.
- * @param olapURLService the olapURLService to use.
- */
- public OlapUrlConverter( ImportObjectService importObjectService,
- OlapURLService olapURLService )
- {
- this.importObjectService = importObjectService;
- this.olapURLService = olapURLService;
- }
-
- // -------------------------------------------------------------------------
- // XMLConverter implementation
- // -------------------------------------------------------------------------
-
- public void write( XMLWriter writer, ExportParams params )
- {
- Collection<OlapURL> olapUrls = olapURLService.getOlapURLs( params.getOlapUrls() );
-
- if ( olapUrls != null && olapUrls.size() > 0 )
- {
- writer.openElement( COLLECTION_NAME );
-
- for ( OlapURL url : olapUrls )
- {
- writer.openElement( ELEMENT_NAME );
-
- writer.writeElement( FIELD_ID, String.valueOf( url.getId() ) );
- writer.writeElement( FIELD_NAME, url.getName() );
- writer.writeElement( FIELD_URL, url.getUrl() );
-
- writer.closeElement();
- }
-
- writer.closeElement();
- }
- }
-
- public void read( XMLReader reader, ImportParams params )
- {
- while ( reader.moveToStartElement( ELEMENT_NAME, COLLECTION_NAME ) )
- {
- final Map<String, String> values = reader.readElements( ELEMENT_NAME );
-
- final OlapURL olapUrl = new OlapURL();
-
- olapUrl.setId( Integer.parseInt( values.get( FIELD_ID ) ) );
- olapUrl.setName( values.get( FIELD_NAME ) );
- olapUrl.setUrl( values.get( FIELD_URL ) );
-
- importObject( olapUrl, params );
- }
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2011-02-02 17:56:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2011-04-24 12:47:31 +0000
@@ -88,7 +88,6 @@
import org.hisp.dhis.importexport.dxf.converter.IndicatorGroupSetConverter;
import org.hisp.dhis.importexport.dxf.converter.IndicatorGroupSetMemberConverter;
import org.hisp.dhis.importexport.dxf.converter.IndicatorTypeConverter;
-import org.hisp.dhis.importexport.dxf.converter.OlapUrlConverter;
import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitConverter;
import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitGroupConverter;
import org.hisp.dhis.importexport.dxf.converter.OrganisationUnitGroupMemberConverter;
@@ -99,7 +98,6 @@
import org.hisp.dhis.importexport.dxf.converter.ReportTableConverter;
import org.hisp.dhis.importexport.dxf.converter.ValidationRuleConverter;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.PeriodService;
@@ -227,13 +225,6 @@
this.chartService = chartService;
}
- private OlapURLService olapURLService;
-
- public void setOlapURLService( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
private CompleteDataSetRegistrationService completeDataSetRegistrationService;
public void setCompleteDataSetRegistrationService(
@@ -335,7 +326,6 @@
thread.registerXMLConverter( new ReportConverter( reportService ) );
thread.registerXMLConverter( new ReportTableConverter( reportTableService ) );
thread.registerXMLConverter( new ChartConverter( chartService ) );
- thread.registerXMLConverter( new OlapUrlConverter( olapURLService ) );
thread.registerXMLConverter( new CompleteDataSetRegistrationConverter( completeDataSetRegistrationService,
dataSetService, organisationUnitService, periodService ) );
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java 2010-05-31 15:06:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OlapUrlImporter.java 1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-package org.hisp.dhis.importexport.importer;
-
-/*
- * 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.importexport.GroupMemberType;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.Importer;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapUrlImporter
- extends AbstractImporter<OlapURL> implements Importer<OlapURL>
-{
- protected OlapURLService olapURLService;
-
- public OlapUrlImporter()
- {
- }
-
- public OlapUrlImporter( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
- @Override
- public void importObject( OlapURL object, ImportParams params )
- {
- read( object, GroupMemberType.NONE, params );
- }
-
- @Override
- protected void importUnique( OlapURL object )
- {
- olapURLService.saveOlapURL( object );
- }
-
- @Override
- protected void importMatching( OlapURL object, OlapURL match )
- {
- match.setName( object.getName() );
- match.setUrl( object.getUrl() );
-
- olapURLService.updateOlapURL( match );
- }
-
- @Override
- protected OlapURL getMatching( OlapURL object )
- {
- return olapURLService.getOlapURLByName( object.getName() );
- }
-
- @Override
- protected boolean isIdentical( OlapURL object, OlapURL existing )
- {
- if ( !object.getName().equals( existing.getName() ) )
- {
- return false;
- }
- if ( !isSimiliar( object.getUrl(), existing.getUrl() ) || ( isNotNull( object.getUrl(), existing.getUrl() ) && !object.getUrl().equals( existing.getUrl() ) ) )
- {
- return false;
- }
-
- return true;
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2011-04-24 12:47:31 +0000
@@ -85,7 +85,6 @@
import org.hisp.dhis.importexport.importer.IndicatorGroupSetImporter;
import org.hisp.dhis.importexport.importer.IndicatorImporter;
import org.hisp.dhis.importexport.importer.IndicatorTypeImporter;
-import org.hisp.dhis.importexport.importer.OlapUrlImporter;
import org.hisp.dhis.importexport.importer.OrganisationUnitGroupImporter;
import org.hisp.dhis.importexport.importer.OrganisationUnitImporter;
import org.hisp.dhis.importexport.importer.OrganisationUnitLevelImporter;
@@ -132,8 +131,6 @@
import org.hisp.dhis.jdbc.batchhandler.OrganisationUnitGroupMemberBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.PeriodBatchHandler;
import org.hisp.dhis.jdbc.batchhandler.ReportTableBatchHandler;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -242,13 +239,6 @@
this.validationRuleService = validationRuleService;
}
- private OlapURLService olapURLService;
-
- public void setOlapURLService( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
private ExpressionService expressionService;
public void setExpressionService( ExpressionService expressionService )
@@ -1021,24 +1011,7 @@
log.info( "Imported Reports" );
}
-
- @Transactional
- public void importOlapURLs()
- {
- Collection<ImportObject> importObjects = importObjectStore.getImportObjects( OlapURL.class );
-
- Importer<OlapURL> importer = new OlapUrlImporter( olapURLService );
-
- for ( ImportObject importObject : importObjects )
- {
- importer.importObject( (OlapURL) importObject.getObject(), params );
- }
-
- importObjectStore.deleteImportObjects( OlapURL.class );
-
- log.info( "Imported OlapURLs" );
- }
-
+
@Transactional
public void importCompleteDataSetRegistrations()
{
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2011-03-03 17:13:35 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2011-04-24 12:47:31 +0000
@@ -67,8 +67,6 @@
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.IndicatorType;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -186,13 +184,6 @@
this.chartService = chartService;
}
- private OlapURLService olapURLService;
-
- public void setOlapURLService( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
-
private DataValueService dataValueService;
public void setDataValueService( DataValueService dataValueService )
@@ -605,12 +596,6 @@
chart.setName( chartService.getChart( existingObjectId ).getName() );
}
- else if ( object.getClass().equals( OlapURL.class ) )
- {
- OlapURL url = (OlapURL) object;
-
- url.setName( olapURLService.getOlapURL( existingObjectId ).getName() );
- }
else if ( object.getClass().equals( DataValue.class ) )
{
DataValue dataValue = (DataValue) object;
@@ -672,7 +657,6 @@
importObjectManager.importReports();
importObjectManager.importReportTables();
importObjectManager.importCharts();
- importObjectManager.importOlapURLs();
importObjectManager.importCompleteDataSetRegistrations();
importObjectManager.importDataValues();
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-02-22 23:17:50 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 12:47:31 +0000
@@ -87,7 +87,6 @@
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
<property name="validationRuleService" ref="org.hisp.dhis.validation.ValidationRuleService" />
- <property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
<property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
<property name="importDataValueService" ref="org.hisp.dhis.importexport.ImportDataValueService" />
<property name="reportService" ref="org.hisp.dhis.report.ReportService"/>
@@ -122,7 +121,6 @@
<property name="reportService" ref="org.hisp.dhis.report.ReportService"/>
<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
<property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
- <property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
<property name="cacheManager" ref="cacheManager"/>
</bean>
@@ -256,7 +254,6 @@
<property name="reportService" ref="org.hisp.dhis.report.ReportService"/>
<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
<property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
- <property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
<property name="aggregatedDataValueService" ref="org.hisp.dhis.aggregation.AggregatedDataValueService" />
<property name="batchHandlerFactory" ref="batchHandlerFactory" />
@@ -316,7 +313,6 @@
<property name="reportService" ref="org.hisp.dhis.report.ReportService" />
<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
<property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
- <property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
<property name="completeDataSetRegistrationService"
ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
<property name="aggregatedDataValueService" ref="org.hisp.dhis.aggregation.AggregatedDataValueService" />
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 2011-01-21 16:22:50 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 2011-04-24 12:47:31 +0000
@@ -29,7 +29,6 @@
import org.hisp.dhis.document.Document;
import org.hisp.dhis.mapping.MapView;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.report.Report;
import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.system.deletion.DeletionHandler;
@@ -68,19 +67,7 @@
}
}
}
-
- @Override
- public void deleteOlapURL( OlapURL olapURL )
- {
- for ( DashboardContent content : dashboardService.getAllDashboardContent() )
- {
- if ( content.getOlapUrls().remove( olapURL ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
- }
-
+
@Override
public void deleteDocument( Document document )
{
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/OlapUrlContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/OlapUrlContentProvider.java 2011-03-24 02:10:56 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/OlapUrlContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * 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.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardService;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.comparator.OlapURLNameComparator;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapUrlContentProvider
- implements ContentProvider
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- private DashboardService dashboardService;
-
- public void setDashboardService( DashboardService dashboardService )
- {
- this.dashboardService = dashboardService;
- }
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- User user = currentUserService.getCurrentUser();
-
- if ( user != null )
- {
- DashboardContent dashboardContent = dashboardService.getDashboardContent( user );
-
- List<OlapURL> urls = dashboardContent.getOlapUrls();
-
- Collections.sort( urls, new OlapURLNameComparator() );
-
- content.put( key, urls );
- }
-
- return content;
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap/DefaultOlapURLService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap/DefaultOlapURLService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/olap/DefaultOlapURLService.java 1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-package org.hisp.dhis.olap;
-
-/*
- * 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.Collection;
-
-import org.hisp.dhis.common.GenericIdentifiableObjectStore;
-import org.hisp.dhis.system.util.Filter;
-import org.hisp.dhis.system.util.FilterUtils;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-@Transactional
-public class DefaultOlapURLService
- implements OlapURLService
-{
- private final static String MAP_FORM = "map.html";
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private GenericIdentifiableObjectStore<OlapURL> olapURLStore;
-
- public void setOlapURLStore( GenericIdentifiableObjectStore<OlapURL> olapURLStore )
- {
- this.olapURLStore = olapURLStore;
- }
-
- // -------------------------------------------------------------------------
- // OlapURLService implementation
- // -------------------------------------------------------------------------
-
- public String getMapURL( String application, String cube, String indicator,
- String organisationUnit, String year, String month, String level )
- {
- StringBuffer url = new StringBuffer();
-
- url.append( application ).append( "/" + MAP_FORM );
- url.append( "?cube=" ).append( cube );
- url.append( "&columns=[Indicator].[" ).append( indicator ).append( "]" );
- url.append( "&rows=[Location].[" ).append( organisationUnit ).append( "]," );
- url.append( "[Period].[" ).append( year ).append( "].[" ).append( month ).append( "]" );
- url.append( "&aggregate=[Location].[" ).append( level ).append( "]" );
- url.append( "&filter=&slicer=" );
-
- return url.toString();
- }
-
- public int saveOlapURL( OlapURL olapURL )
- {
- return olapURLStore.save( olapURL );
- }
-
- public void updateOlapURL( OlapURL olapURL )
- {
- olapURLStore.update( olapURL );
- }
-
- public OlapURL getOlapURL( int id )
- {
- return olapURLStore.get( id );
- }
-
- public Collection<OlapURL> getOlapURLs( final Collection<Integer> identifiers )
- {
- Collection<OlapURL> objects = getAllOlapURLs();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<OlapURL>()
- {
- public boolean retain( OlapURL object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- public void deleteOlapURL( OlapURL olapURL )
- {
- olapURLStore.delete( olapURL );
- }
-
- public Collection<OlapURL> getAllOlapURLs()
- {
- return olapURLStore.getAll();
- }
-
- public OlapURL getOlapURLByName( String name )
- {
- return olapURLStore.getByName( name );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 12:17:55 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 12:47:31 +0000
@@ -5,21 +5,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";>
-
- <!-- OLAP -->
-
- <bean id="org.hisp.dhis.olap.OlapURLStore"
- class="org.hisp.dhis.hibernate.HibernateGenericStore">
- <property name="clazz" value="org.hisp.dhis.olap.OlapURL"/>
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
-
- <bean id="org.hisp.dhis.olap.OlapURLService"
- class="org.hisp.dhis.olap.DefaultOlapURLService">
- <property name="olapURLStore"
- ref="org.hisp.dhis.olap.OlapURLStore"/>
- </bean>
-
+
<!-- ReportTable -->
<bean id="internal-process-ReportTable"
@@ -249,14 +235,7 @@
<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
<property name="key" value="mapViews"/>
</bean>
-
- <bean id="olapUrlContentProvider"
- class="org.hisp.dhis.dashboard.provider.OlapUrlContentProvider">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
- <property name="dashboardService" ref="org.hisp.dhis.dashboard.DashboardService"/>
- <property name="key" value="olapUrls"/>
- </bean>
-
+
<bean id="rssHealthContentProvider"
class="org.hisp.dhis.dashboard.provider.RssContentProvider">
<property name="url" value="http://health.yahoo.com/news/rss/health"/>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml 2011-04-24 12:17:55 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml 2011-04-24 12:47:31 +0000
@@ -22,12 +22,6 @@
<many-to-many column="reportid" class="org.hisp.dhis.report.Report" />
</list>
- <list name="olapUrls" table="dashboardcontent_olapurls">
- <key column="userid" />
- <list-index column="sort_order" base="0" />
- <many-to-many column="olapurlid" class="org.hisp.dhis.olap.OlapURL" />
- </list>
-
<list name="documents" table="dashboardcontent_documents">
<key column="userid" />
<list-index column="sort_order" base="0" />
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap'
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml 2011-04-12 13:30:10 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.olap.OlapURL" table="olapurl">
-
- <id name="id" column="olapurlid">
- <generator class="native" />
- </id>
-
- <property name="name">
- <column name="name" not-null="true" unique="true" length="160" />
- </property>
-
- <property name="url" type="text" />
-
- </class>
-</hibernate-mapping>
\ No newline at end of file
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java 2011-02-01 11:03:47 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java 2011-04-24 12:47:31 +0000
@@ -33,8 +33,6 @@
import org.hibernate.NonUniqueObjectException;
import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.olap.OlapURL;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.report.Report;
import org.hisp.dhis.report.ReportService;
import org.hisp.dhis.user.User;
@@ -53,16 +51,12 @@
private ReportService reportService;
- private OlapURLService olapURLService;
-
private DashboardContentStore dashboardContentStore;
private User userA;
private Report reportA;
- private OlapURL urlA;
-
private DashboardContent contentA;
private DashboardContent contentB;
@@ -73,8 +67,6 @@
reportService = (ReportService) getBean( ReportService.ID );
- olapURLService = (OlapURLService) getBean( OlapURLService.ID );
-
dashboardContentStore = (DashboardContentStore) getBean( DashboardContentStore.ID );
userA = createUser( 'A' );
@@ -83,9 +75,6 @@
reportA = new Report( "ReportA", "DesignA", null );
reportService.saveReport( reportA );
- urlA = createOlapURL( 'A' );
- olapURLService.saveOlapURL( urlA );
-
contentA = new DashboardContent();
contentB = new DashboardContent();
}
@@ -95,14 +84,12 @@
{
contentA.setUser( userA );
contentA.getReports().add( reportA );
- contentA.getOlapUrls().add( urlA );
dashboardContentStore.save( contentA );
assertEquals( contentA, dashboardContentStore.get( userA ) );
assertEquals( userA, dashboardContentStore.get( userA ).getUser() );
assertEquals( reportA, dashboardContentStore.get( userA ).getReports().iterator().next() );
- assertEquals( urlA, dashboardContentStore.get( userA ).getOlapUrls().iterator().next() );
}
@Test
@@ -115,26 +102,7 @@
dashboardContentStore.save( contentA );
dashboardContentStore.save( contentB );
}
-
- @Test
- public void saveOrUpdate()
- {
- contentA.setUser( userA );
- contentA.getReports().add( reportA );
-
- dashboardContentStore.save( contentA );
-
- assertEquals( contentA, dashboardContentStore.get( userA ) );
- assertEquals( reportA, dashboardContentStore.get( userA ).getReports().iterator().next() );
-
- contentA.getOlapUrls().add( urlA );
-
- dashboardContentStore.save( contentA );
-
- assertEquals( contentA, dashboardContentStore.get( userA ) );
- assertEquals( urlA, dashboardContentStore.get( userA ).getOlapUrls().iterator().next() );
- }
-
+
@Test
public void delete()
{
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLServiceTest.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLServiceTest.java 1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-package org.hisp.dhis.olap;
-
-/*
- * 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 junit.framework.Assert.assertEquals;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.junit.Test;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class OlapURLServiceTest
- extends DhisSpringTest
-{
- private OlapURLService olapURLService;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- olapURLService = (OlapURLService) getBean( OlapURLService.ID );
- }
-
- // -------------------------------------------------------------------------
- // Tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testGetMapURL()
- {
- String url = olapURLService.getMapURL( "openhealth-fp", "ind_ou4", "BCG < 1 y coverage",
- "MOHSW", "2008", "Apr", "OrgUnit4" );
-
- assertEquals( "openhealth-fp/map.html?cube=ind_ou4&columns=[Indicator].[BCG < 1 y coverage]&rows=[Location].[MOHSW],[Period].[2008].[Apr]&aggregate=[Location].[OrgUnit4]&filter=&slicer=", url );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLStoreTest.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/olap/OlapURLStoreTest.java 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-package org.hisp.dhis.olap;
-
-/*
- * 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 junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-
-import java.util.Collection;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.common.GenericIdentifiableObjectStore;
-import org.junit.Test;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-@SuppressWarnings( "unchecked" )
-public class OlapURLStoreTest
- extends DhisSpringTest
-{
- private GenericIdentifiableObjectStore<OlapURL> olapURLStore;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- olapURLStore = (GenericIdentifiableObjectStore<OlapURL>) getBean( "org.hisp.dhis.olap.OlapURLStore" );
- }
-
- // -------------------------------------------------------------------------
- // Tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testSaveOlapURL()
- {
- OlapURL olapURL = createOlapURL( 'A' );
-
- int id = olapURLStore.save( olapURL );
-
- olapURL = olapURLStore.get( id );
-
- assertEquals( "OlapURLA", olapURL.getName() );
- assertEquals( "URLA", olapURL.getUrl() );
- }
-
- @Test
- public void testDeleteOlapURL()
- {
- OlapURL olapURLA = createOlapURL( 'A' );
- OlapURL olapURLB = createOlapURL( 'B' );
-
- int idA = olapURLStore.save( olapURLA );
- int idB = olapURLStore.save( olapURLB );
-
- assertNotNull( olapURLStore.get( idA ) );
- assertNotNull( olapURLStore.get( idB ) );
-
- olapURLStore.delete( olapURLA );
-
- assertNull( olapURLStore.get( idA ) );
- assertNotNull( olapURLStore.get( idB ) );
-
- olapURLStore.delete( olapURLB );
-
- assertNull( olapURLStore.get( idA ) );
- assertNull( olapURLStore.get( idB ) );
- }
-
- @Test
- public void testGetAllOlapURLs()
- {
- OlapURL olapURLA = createOlapURL( 'A' );
- OlapURL olapURLB = createOlapURL( 'B' );
-
- olapURLStore.save( olapURLA );
- olapURLStore.save( olapURLB );
-
- Collection<OlapURL> olapURLs = olapURLStore.getAll();
-
- assertNotNull( olapURLs );
- assertEquals( 2, olapURLs.size() );
-
- assertTrue( olapURLs.contains( olapURLA ) );
- assertTrue( olapURLs.contains( olapURLB ) );
- }
-}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-04-24 12:47:31 +0000
@@ -55,7 +55,6 @@
import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.mapping.MapView;
import org.hisp.dhis.minmax.MinMaxDataElement;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -425,15 +424,6 @@
return true;
}
- public void deleteOlapURL( OlapURL olapURL )
- {
- }
-
- public boolean allowDeleteOlapURL( OlapURL olapURL )
- {
- return true;
- }
-
public void deleteDocument( Document document )
{
}
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-04-24 12:47:31 +0000
@@ -73,7 +73,6 @@
import org.hisp.dhis.mapping.MapLegendSet;
import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.message.MessageService;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -850,16 +849,6 @@
return chart;
}
- public static OlapURL createOlapURL( char uniqueCharacter )
- {
- OlapURL olapURL = new OlapURL();
-
- olapURL.setName( "OlapURL" + uniqueCharacter );
- olapURL.setUrl( "URL" + uniqueCharacter );
-
- return olapURL;
- }
-
public static User createUser( char uniqueCharacter )
{
User user = new User();
=== removed file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveOlapUrlAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveOlapUrlAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveOlapUrlAction.java 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.dashboard.action;
-
-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;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class RemoveOlapUrlAction
-implements Action
-{
- // -------------------------------------------------------------------------
- // 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 );
-
- if ( content.getOlapUrls().remove( url ) )
- {
- dashboardService.saveDashboardContent( content );
- }
- }
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2011-04-11 09:14:35 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 12:47:31 +0000
@@ -41,14 +41,6 @@
<property name="reportService" ref="org.hisp.dhis.report.ReportService"/>
</bean>
- <bean id="org.hisp.dhis.dashboard.action.RemoveOlapUrlAction"
- class="org.hisp.dhis.dashboard.action.RemoveOlapUrlAction"
- 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>
-
<bean id="org.hisp.dhis.dashboard.action.RemoveDocumentAction"
class="org.hisp.dhis.dashboard.action.RemoveDocumentAction"
scope="prototype">
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2011-04-08 14:50:37 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2011-04-24 12:47:31 +0000
@@ -38,11 +38,7 @@
<action name="removeReport" class="org.hisp.dhis.dashboard.action.RemoveReportAction">
<result name="success" type="redirect">index.action</result>
</action>
-
- <action name="removeOlapUrl" class="org.hisp.dhis.dashboard.action.RemoveOlapUrlAction">
- <result name="success" type="redirect">index.action</result>
- </action>
-
+
<action name="removeDocument" class="org.hisp.dhis.dashboard.action.RemoveDocumentAction">
<result name="success" type="redirect">index.action</result>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2010-07-30 12:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2011-04-24 12:47:31 +0000
@@ -28,6 +28,7 @@
*/
import static org.hisp.dhis.common.Objects.CALCULATEDDATAELEMENT;
+import static org.hisp.dhis.common.Objects.CHART;
import static org.hisp.dhis.common.Objects.DATADICTIONARY;
import static org.hisp.dhis.common.Objects.DATAELEMENT;
import static org.hisp.dhis.common.Objects.DATAELEMENTGROUP;
@@ -37,14 +38,12 @@
import static org.hisp.dhis.common.Objects.INDICATORGROUP;
import static org.hisp.dhis.common.Objects.INDICATORGROUPSET;
import static org.hisp.dhis.common.Objects.INDICATORTYPE;
-import static org.hisp.dhis.common.Objects.OLAPURL;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNIT;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNITGROUP;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNITGROUPSET;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNITLEVEL;
import static org.hisp.dhis.common.Objects.REPORT;
import static org.hisp.dhis.common.Objects.REPORTTABLE;
-import static org.hisp.dhis.common.Objects.CHART;
import static org.hisp.dhis.common.Objects.VALIDATIONRULE;
import java.util.Collection;
@@ -55,7 +54,6 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.importexport.ImportObjectService;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.olap.OlapURLService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.report.ReportService;
@@ -197,13 +195,6 @@
{
this.chartService = chartService;
}
-
- private OlapURLService olapURLService;
-
- public void setOlapURLService( OlapURLService olapURLService )
- {
- this.olapURLService = olapURLService;
- }
// -------------------------------------------------------------------------
// Action implementation
@@ -286,10 +277,6 @@
{
objects = chartService.getAllCharts();
}
- else if ( objectType.equals( OLAPURL.name() ) )
- {
- objects = olapURLService.getAllOlapURLs();
- }
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2011-04-24 12:47:31 +0000
@@ -55,7 +55,6 @@
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorType;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -449,7 +448,6 @@
newReports = importObjectService.getImportObjects( NEW, Report.class ).size();
newReportTables = importObjectService.getImportObjects( NEW, ReportTable.class ).size();
newCharts = importObjectService.getImportObjects( NEW, Chart.class ).size();
- newOlapUrls = importObjectService.getImportObjects( NEW, OlapURL.class ).size();
newDataValues = importDataValueService.getNumberOfImportDataValues( NEW );
updateDataElements = importObjectService.getImportObjects( UPDATE, DataElement.class ).size();
@@ -470,7 +468,6 @@
updateReports = importObjectService.getImportObjects( UPDATE, Report.class ).size();
updateReportTables = importObjectService.getImportObjects( UPDATE, ReportTable.class ).size();
updateCharts = importObjectService.getImportObjects( UPDATE, Chart.class ).size();
- updateOlapUrls = importObjectService.getImportObjects( UPDATE, OlapURL.class ).size();
updateDataValues = importDataValueService.getNumberOfImportDataValues( UPDATE );
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java 2011-04-24 12:47:31 +0000
@@ -38,7 +38,6 @@
import static org.hisp.dhis.common.Objects.INDICATORGROUP;
import static org.hisp.dhis.common.Objects.INDICATORGROUPSET;
import static org.hisp.dhis.common.Objects.INDICATORTYPE;
-import static org.hisp.dhis.common.Objects.OLAPURL;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNIT;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNITGROUP;
import static org.hisp.dhis.common.Objects.ORGANISATIONUNITGROUPSET;
@@ -62,7 +61,6 @@
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorType;
-import org.hisp.dhis.olap.OlapURL;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -98,7 +96,6 @@
classMap.put( ORGANISATIONUNITLEVEL, OrganisationUnitLevel.class );
classMap.put( VALIDATIONRULE, ValidationRule.class );
classMap.put( REPORTTABLE, ReportTable.class );
- classMap.put( OLAPURL, OlapURL.class );
classMap.put( DATAVALUE, DataValue.class );
}
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-03-22 16:53:11 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 12:47:31 +0000
@@ -113,7 +113,6 @@
<property name="reportService" ref="org.hisp.dhis.report.ReportService"/>
<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
<property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>
- <property name="olapURLService" ref="org.hisp.dhis.olap.OlapURLService" />
</bean>
<bean id="org.hisp.dhis.importexport.action.imp.GetCompareOptionsAction"
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2010-07-30 12:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm 2011-04-24 12:47:31 +0000
@@ -192,12 +192,6 @@
#end
- #if ( $objectType == "OLAPURL" )
-
- #compareProperty( $importObject.object.url $importObject.compareObject.url "url" )
-
- #end
-
<tr>
<td colspan="2" style="height:15px"></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2011-03-28 14:39:48 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm 2011-04-24 12:47:31 +0000
@@ -84,10 +84,6 @@
<td><input id="charts" name="charts" type="checkbox" value="true" /></td>
<td><label for="charts">$i18n.getString( 'charts' )</label></td>
</tr>
- <tr>
- <td><input id="olapUrls" name="olapUrls" type="checkbox" value="true" /></td>
- <td><label for="olapUrls">$i18n.getString( 'olap_urls' )</label></td>
- </tr>
<!-- Submit -->
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js 2010-07-30 12:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js 2011-04-24 12:47:31 +0000
@@ -206,14 +206,6 @@
{
handleField( discardedElements, "updateChartSpan", "updateChartTd" );
}
- else if ( elementType == "OLAPURL" && elementStatus == "NEW" )
- {
- handleField( discardedElements, "newOlapUrlSpan", "newOlapUrlTd" );
- }
- else if ( elementType == "OLAPURL" && elementStatus == "UPDATE" )
- {
- handleField( iscardedElements, "updateOlapUrlSpan", "updateOlapUrlTd" );
- }
else if ( elementType == "DATAVALUE" && elementStatus == "NEW" )
{
handleField( discardedElements, "newDataValueSpan", "newDataValueTd" );
@@ -343,11 +335,6 @@
clearField( "newChartTd" );
clearFIeld( "updateChartTd" );
}
- else if ( elementType == "OLAPURL" )
- {
- clearField( "newOlapUrlTd" );
- clearField( "updateOlapUrlTd" );
- }
else if ( elementType == "DATAVALUE" )
{
clearField( "newDataValueTd" );
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2010-07-30 12:59:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2011-04-24 12:47:31 +0000
@@ -171,13 +171,7 @@
#displayBoolProperty( "individual_quarters_this_year" $importObject.object.individualQuartersThisYear )
#end
-
- #if ( $objectType == "OLAPURL" )
-
- #displayProperty( "url" $importObject.object.url )
- #end
-
<tr>
<td colspan="2" style="height:10px">
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2010-09-13 08:15:46 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2011-04-24 12:47:31 +0000
@@ -61,7 +61,6 @@
#displayObjects( "report" "Report" $newReports $updateReports )
#displayObjects( "report_table" "ReportTable" $newReportTables $updateReportTables )
#displayObjects( "chart" "Chart" $newCharts $updateCharts )
- #displayObjects( "olap_url" "OlapUrl" $newOlapUrls $updateOlapUrls )
#displayObjects( "datavalue" "DataValue" $newDataValues $updateDataValues )
<tr>
