=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-12-22 16:01:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-12-22 17:28:35 +0000
@@ -27,6 +27,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.hisp.dhis.common.BaseIdentifiableObject;
@@ -46,14 +57,6 @@
 import org.hisp.dhis.period.RelativePeriods;
 import org.hisp.dhis.user.User;
 
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
  * @author Lars Helge Overland
  */
@@ -111,8 +114,6 @@
 
     private String targetLineLabel;
 
-    private Set<ChartGroup> groups = new HashSet<ChartGroup>();
-
     private List<Indicator> indicators = new ArrayList<Indicator>();
 
     private List<DataElement> dataElements = new ArrayList<DataElement>();
@@ -166,34 +167,6 @@
     // Logic
     // -------------------------------------------------------------------------
 
-    public void addChartGroup( ChartGroup group )
-    {
-        groups.add( group );
-        group.getMembers().add( this );
-    }
-
-    public void removeChartGroup( ChartGroup group )
-    {
-        groups.remove( group );
-        group.getMembers().remove( this );
-    }
-
-    public void updateChartGroups( Set<ChartGroup> updates )
-    {
-        for ( ChartGroup group : new HashSet<ChartGroup>( groups ) )
-        {
-            if ( !updates.contains( group ) )
-            {
-                removeChartGroup( group );
-            }
-        }
-
-        for ( ChartGroup group : updates )
-        {
-            addChartGroup( group );
-        }
-    }
-    
     public List<NameableObject> series()
     {
         return dimensionToList( series );
@@ -641,16 +614,6 @@
         this.allOrganisationUnits = allOrganisationUnits;
     }
 
-    public Set<ChartGroup> getGroups()
-    {
-        return groups;
-    }
-
-    public void setGroups( Set<ChartGroup> groups )
-    {
-        this.groups = groups;
-    }
-
     @XmlElement
     @JsonProperty
     public User getUser()

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartGroup.java	2011-12-03 10:35:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartGroup.java	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-package org.hisp.dhis.chart;
-
-/*
- * Copyright (c) 2004-2011, 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.BaseIdentifiableObject;
-import org.hisp.dhis.common.Dxf2Namespace;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Dang Duy Hieu
- */
-@XmlRootElement( name = "chartGroup", namespace = Dxf2Namespace.NAMESPACE )
-@XmlAccessorType( value = XmlAccessType.NONE )
-public class ChartGroup extends BaseIdentifiableObject
-{
-    /**
-     * Determines if a de-serialized file is compatible with this class.
-     */
-    private static final long serialVersionUID = -1L;
-
-    private Set<Chart> members = new HashSet<Chart>();
-
-    // -------------------------------------------------------------------------
-    // Constructors
-    // -------------------------------------------------------------------------
-
-    public ChartGroup()
-    {
-    }
-
-    public ChartGroup( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Logic
-    // -------------------------------------------------------------------------
-
-    public void addChart( Chart chart )
-    {
-        members.add( chart );
-        chart.getGroups().add( this );
-    }
-
-    public void removeChart( Chart chart )
-    {
-        members.remove( chart );
-        chart.getGroups().remove( this );
-    }
-
-    public void updateCharts( Set<Chart> updates )
-    {
-        for ( Chart chart : new HashSet<Chart>( members ) )
-        {
-            if ( !updates.contains( chart ) )
-            {
-                removeChart( chart );
-            }
-        }
-
-        for ( Chart chart : updates )
-        {
-            addChart( chart );
-        }
-    }
-
-    // -------------------------------------------------------------------------
-    // hashCode and equals
-    // -------------------------------------------------------------------------
-
-    @Override
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-
-        if ( o == null )
-        {
-            return false;
-        }
-
-        if ( !(o instanceof ChartGroup) )
-        {
-            return false;
-        }
-
-        final ChartGroup other = (ChartGroup) o;
-
-        return name.equals( other.getName() );
-    }
-
-    @Override
-    public String toString()
-    {
-        return "[" + name + "]";
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters and setters
-    // -------------------------------------------------------------------------
-
-    public Set<Chart> getMembers()
-    {
-        return members;
-    }
-
-    public void setMembers( Set<Chart> members )
-    {
-        this.members = members;
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java	2011-12-22 17:00:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java	2011-12-22 17:28:35 +0000
@@ -90,33 +90,4 @@
     int getChartCount();
 
     int getChartCountByName( String name );
-
-    // -------------------------------------------------------------------------
-    // ChartGroup
-    // -------------------------------------------------------------------------
-
-    int addChartGroup( ChartGroup chartGroup );
-
-    void updateChartGroup( ChartGroup chartGroup );
-
-    void deleteChartGroup( ChartGroup chartGroup );
-
-    ChartGroup getChartGroup( int id );
-
-    ChartGroup getChartGroupByName( String name );
-
-    Collection<ChartGroup> getAllChartGroups();
-
-    Collection<ChartGroup> getChartGroups( final Collection<Integer> identifiers );
-
-    Collection<ChartGroup> getGroupsContainingChart( Chart chart );
-
-    int getChartGroupCount();
-
-    int getChartGroupCountByName( String name );
-
-    Collection<ChartGroup> getChartGroupsBetween( int first, int max );
-
-    Collection<ChartGroup> getChartGroupsBetweenByName( String name, int first, int max );
-
 }

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartGroupNameComparator.java	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartGroupNameComparator.java	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-package org.hisp.dhis.chart.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.chart.ChartGroup;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ChartGroupNameComparator
-    implements Comparator<ChartGroup>
-{
-    public int compare( ChartGroup group1, ChartGroup group2 )
-    {
-        return group1.getName().compareToIgnoreCase( group2.getName() );
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContents.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContents.java	2011-12-21 14:03:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContents.java	2011-12-22 17:28:35 +0000
@@ -27,16 +27,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.hisp.dhis.common.BaseCollection;
-import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.Dxf2Namespace;
 
-import javax.xml.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2011-12-22 13:18:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2011-12-22 17:28:35 +0000
@@ -27,6 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.hisp.dhis.common.BaseIdentifiableObject;
@@ -34,14 +40,6 @@
 import org.hisp.dhis.common.adapter.ReportTableXmlAdapter;
 import org.hisp.dhis.reporttable.ReportTable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * @author Lars Helge Overland
  * @version $Id$
@@ -61,8 +59,6 @@
 
     private Boolean usingOrgUnitGroupSets;
 
-    private Set<ReportGroup> groups = new HashSet<ReportGroup>();
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -82,34 +78,6 @@
     // Logic
     // -------------------------------------------------------------------------
 
-    public void addReportGroup( ReportGroup group )
-    {
-        groups.add( group );
-        group.getMembers().add( this );
-    }
-
-    public void removeReportGroup( ReportGroup group )
-    {
-        groups.remove( group );
-        group.getMembers().remove( this );
-    }
-
-    public void updateReportGroups( Set<ReportGroup> updates )
-    {
-        for ( ReportGroup group : new HashSet<ReportGroup>( groups ) )
-        {
-            if ( !updates.contains( group ) )
-            {
-                removeReportGroup( group );
-            }
-        }
-
-        for ( ReportGroup group : updates )
-        {
-            addReportGroup( group );
-        }
-    }
-
     public boolean hasReportTable()
     {
         return reportTable != null;
@@ -198,14 +166,4 @@
     {
         this.usingOrgUnitGroupSets = usingOrgUnitGroupSets;
     }
-
-    public Set<ReportGroup> getGroups()
-    {
-        return groups;
-    }
-
-    public void setGroups( Set<ReportGroup> groups )
-    {
-        this.groups = groups;
-    }
 }

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportGroup.java	2011-11-24 14:36:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportGroup.java	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-package org.hisp.dhis.report;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.common.BaseIdentifiableObject;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ReportGroup
-    extends BaseIdentifiableObject
-{
-    /**
-     * Determines if a de-serialized file is compatible with this class.
-     */
-    private static final long serialVersionUID = -1L;
-
-    private Set<Report> members = new HashSet<Report>();
-    
-    // -------------------------------------------------------------------------
-    // Constructors
-    // -------------------------------------------------------------------------
-
-    public ReportGroup()
-    {
-    }
-
-    public ReportGroup( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Logic
-    // -------------------------------------------------------------------------
-
-    public void addReport( Report report )
-    {
-        members.add( report );
-        report.getGroups().add( this );
-    }
-    
-    public void removeReport( Report report )
-    {
-        members.remove( report );
-        report.getGroups().remove( this );
-    }
-    
-    public void updateReports( Set<Report> updates )
-    {
-        for ( Report report : new HashSet<Report>( members ) )
-        {
-            if ( !updates.contains( report ) )
-            {
-                removeReport( report );
-            }
-        }
-        
-        for ( Report report : updates )
-        {
-            addReport( report );
-        }
-    }
-    
-    // -------------------------------------------------------------------------
-    // hashCode and equals
-    // -------------------------------------------------------------------------
-
-    @Override
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-
-        if ( o == null )
-        {
-            return false;
-        }
-
-        if ( !(o instanceof ReportGroup) )
-        {
-            return false;
-        }
-
-        final ReportGroup other = (ReportGroup) o;
-
-        return name.equals( other.getName() );
-    }
-
-    @Override
-    public String toString()
-    {
-        return "[" + name + "]";
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters and setters
-    // -------------------------------------------------------------------------
-
-    public Set<Report> getMembers()
-    {
-        return members;
-    }
-
-    public void setMembers( Set<Report> members )
-    {
-        this.members = members;
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java	2011-12-19 19:45:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java	2011-12-22 17:28:35 +0000
@@ -109,34 +109,4 @@
      * @return a Collection of Reports.
      */
     Collection<Report> getReports( final Collection<Integer> identifiers );
-
-    // -------------------------------------------------------------------------
-    // ReportGroup
-    // -------------------------------------------------------------------------
-
-    int addReportGroup( ReportGroup reportGroup );
-
-    void updateReportGroup( ReportGroup reportGroup );
-
-    void deleteReportGroup( ReportGroup reportGroup );
-
-    ReportGroup getReportGroup( int id );
-
-    ReportGroup getReportGroup( String uid );
-
-    ReportGroup getReportGroupByName( String name );
-
-    Collection<ReportGroup> getAllReportGroups();
-
-    Collection<ReportGroup> getReportGroups( final Collection<Integer> identifiers );
-
-    Collection<ReportGroup> getGroupsContainingReport( Report report );
-
-    int getReportGroupCount();
-
-    int getReportGroupCountByName( String name );
-
-    Collection<ReportGroup> getReportGroupsBetween( int first, int max );
-
-    Collection<ReportGroup> getReportGroupsBetweenByName( String name, int first, int max );
 }

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/comparator/ReportGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/comparator/ReportGroupNameComparator.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/comparator/ReportGroupNameComparator.java	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-package org.hisp.dhis.report.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.report.ReportGroup;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ReportGroupNameComparator
-    implements Comparator<ReportGroup>
-{
-    public int compare( ReportGroup group1, ReportGroup group2 )
-    {
-        return group1.getName().compareToIgnoreCase( group2.getName() );
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-12-21 20:06:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-12-22 17:28:35 +0000
@@ -27,11 +27,35 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.hisp.dhis.common.*;
-import org.hisp.dhis.common.adapter.*;
+import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.common.BaseNameableObject;
+import org.hisp.dhis.common.CombinationGenerator;
+import org.hisp.dhis.common.Dxf2Namespace;
+import org.hisp.dhis.common.NameableObject;
+import org.hisp.dhis.common.adapter.CategoryComboXmlAdapter;
+import org.hisp.dhis.common.adapter.CategoryOptionComboXmlAdapter;
+import org.hisp.dhis.common.adapter.DataElementXmlAdapter;
+import org.hisp.dhis.common.adapter.DataSetXmlAdapter;
+import org.hisp.dhis.common.adapter.IndicatorXmlAdapter;
+import org.hisp.dhis.common.adapter.OrganisationUnitXmlAdapter;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
@@ -45,10 +69,6 @@
 import org.hisp.dhis.period.RelativePeriods;
 import org.hisp.dhis.period.comparator.AscendingPeriodComparator;
 
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.*;
-
 /**
  * The ReportTable object represents a customizable database table. It has
  * features like crosstabulation, relative periods, parameters, and display
@@ -169,11 +189,6 @@
     private List<OrganisationUnit> units = new ArrayList<OrganisationUnit>();
 
     /**
-     * The list of OrganisationUnits the ReportTable contains.
-     */
-    private Set<ReportTableGroup> groups = new HashSet<ReportTableGroup>();
-
-    /**
      * The DataElementCategoryCombo for the ReportTable.
      */
     private DataElementCategoryCombo categoryCombo;
@@ -413,34 +428,6 @@
     // Public methods
     // -------------------------------------------------------------------------
 
-    public void addReportTableGroup( ReportTableGroup group )
-    {
-        groups.add( group );
-        group.getMembers().add( this );
-    }
-
-    public void removeReportTableGroup( ReportTableGroup group )
-    {
-        groups.remove( group );
-        group.getMembers().remove( this );
-    }
-
-    public void updateReportTableGroups( Set<ReportTableGroup> updates )
-    {
-        for ( ReportTableGroup group : new HashSet<ReportTableGroup>( groups ) )
-        {
-            if ( !updates.contains( group ) )
-            {
-                removeReportTableGroup( group );
-            }
-        }
-
-        for ( ReportTableGroup group : updates )
-        {
-            addReportTableGroup( group );
-        }
-    }
-
     /**
      * Creates a map which contains mappings between the organisation unit
      * identifier and the name of the group this organisation unit is a member
@@ -1031,16 +1018,6 @@
         this.topLimit = topLimit;
     }
 
-    public Set<ReportTableGroup> getGroups()
-    {
-        return groups;
-    }
-
-    public void setGroups( Set<ReportTableGroup> groups )
-    {
-        this.groups = groups;
-    }
-
     // -------------------------------------------------------------------------
     // Get- and set-methods for transient properties
     // -------------------------------------------------------------------------

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableGroup.java	2011-12-14 10:03:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableGroup.java	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-package org.hisp.dhis.reporttable;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.Dxf2Namespace;
-import org.hisp.dhis.common.adapter.DataElementGroupXmlAdapter;
-
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-/**
- * @author Dang Duy Hieu
- */
-@XmlRootElement( name = "reportTableGroup", namespace = Dxf2Namespace.NAMESPACE )
-@XmlAccessorType( value = XmlAccessType.NONE )
-public class ReportTableGroup
-    extends BaseIdentifiableObject
-{
-    /**
-     * Determines if a de-serialized file is compatible with this class.
-     */
-    private static final long serialVersionUID = -1L;
-
-    private Set<ReportTable> members = new HashSet<ReportTable>();
-    
-    // -------------------------------------------------------------------------
-    // Constructors
-    // -------------------------------------------------------------------------
-
-    public ReportTableGroup()
-    {
-    }
-
-    public ReportTableGroup( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Logic
-    // -------------------------------------------------------------------------
-
-    public void addReportTable( ReportTable reportTable )
-    {
-        members.add( reportTable );
-        reportTable.getGroups().add( this );
-    }
-    
-    public void removeReportTable( ReportTable reportTable )
-    {
-        members.remove( reportTable );
-        reportTable.getGroups().remove( this );
-    }
-    
-    public void updateReportTables( Set<ReportTable> updates )
-    {
-        for ( ReportTable reportTable : new HashSet<ReportTable>( members ) )
-        {
-            if ( !updates.contains( reportTable ) )
-            {
-                removeReportTable( reportTable );
-            }
-        }
-        
-        for ( ReportTable reportTable : updates )
-        {
-            addReportTable( reportTable );
-        }
-    }
-    
-    // -------------------------------------------------------------------------
-    // hashCode and equals
-    // -------------------------------------------------------------------------
-
-    @Override
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-
-        if ( o == null )
-        {
-            return false;
-        }
-
-        if ( !(o instanceof ReportTableGroup) )
-        {
-            return false;
-        }
-
-        final ReportTableGroup other = (ReportTableGroup) o;
-
-        return name.equals( other.getName() );
-    }
-
-    @Override
-    public String toString()
-    {
-        return "[" + name + "]";
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters and setters
-    // -------------------------------------------------------------------------
-
-    @XmlElementWrapper( name = "reportTables" )
-    @XmlElement( name = "reportTable" )
-    @XmlJavaTypeAdapter( DataElementGroupXmlAdapter.class )
-    @JsonProperty( value = "reportTables" )
-    @JsonSerialize( contentAs = BaseIdentifiableObject.class )
-    public Set<ReportTable> getMembers()
-    {
-        return members;
-    }
-
-    public void setMembers( Set<ReportTable> members )
-    {
-        this.members = members;
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java	2011-12-14 11:29:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java	2011-12-22 17:28:35 +0000
@@ -160,34 +160,4 @@
     int getReportTableCount();
 
     int getReportTableCountByName( String name );
-
-    // -------------------------------------------------------------------------
-    // ReportTableGroup
-    // -------------------------------------------------------------------------
-
-    int addReportTableGroup( ReportTableGroup reportTableGroup );
-
-    void updateReportTableGroup( ReportTableGroup reportTableGroup );
-
-    void deleteReportTableGroup( ReportTableGroup reportTableGroup );
-
-    ReportTableGroup getReportTableGroup( int id );
-
-    ReportTableGroup getReportTableGroup( String uid );
-
-    ReportTableGroup getReportTableGroupByName( String name );
-
-    Collection<ReportTableGroup> getAllReportTableGroups();
-
-    Collection<ReportTableGroup> getReportTableGroups( final Collection<Integer> identifiers );
-
-    Collection<ReportTableGroup> getGroupsContainingReportTable( ReportTable reportTable );
-
-    int getReportTableGroupCount();
-
-    int getReportTableGroupCountByName( String name );
-
-    Collection<ReportTableGroup> getReportTableGroupsBetween( int first, int max );
-
-    Collection<ReportTableGroup> getReportTableGroupsBetweenByName( String name, int first, int max );
 }

=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableGroupNameComparator.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableGroupNameComparator.java	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-package org.hisp.dhis.reporttable.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.reporttable.ReportTableGroup;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ReportTableGroupNameComparator
-    implements Comparator<ReportTableGroup>
-{
-    public int compare( ReportTableGroup group1, ReportTableGroup group2 )
-    {
-        return group1.getName().compareToIgnoreCase( group2.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-12-22 13:09:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2011-12-22 17:28:35 +0000
@@ -405,6 +405,15 @@
         executeSql( "update chart set last4quarters = false where last4quarters is null" );
         executeSql( "update chart set last2sixmonths = false where last2sixmonths is null" );
 
+        // report, reporttable, chart groups
+        
+        executeSql( "DROP TABLE reportgroupmembers" );
+        executeSql( "DROP TABLE reportgroup" );
+        executeSql( "DROP TABLE reporttablegroupmembers" );
+        executeSql( "DROP TABLE reporttablegroup" );
+        executeSql( "DROP TABLE chartgroupmembers" );
+        executeSql( "DROP TABLE chartgroup" );
+        
         log.info( "Tables updated" );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-12-22 17:00:08 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-12-22 17:28:35 +0000
@@ -45,7 +45,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -56,7 +55,6 @@
 import org.apache.commons.math.analysis.UnivariateRealInterpolator;
 import org.apache.commons.math.stat.regression.SimpleRegression;
 import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartGroup;
 import org.hisp.dhis.chart.ChartService;
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 import org.hisp.dhis.common.NameableObject;
@@ -163,13 +161,6 @@
         this.currentUserService = currentUserService;
     }
 
-    private GenericIdentifiableObjectStore<ChartGroup> chartGroupStore;
-
-    public void setChartGroupStore( GenericIdentifiableObjectStore<ChartGroup> chartGroupStore )
-    {
-        this.chartGroupStore = chartGroupStore;
-    }
-    
     private ReportTableManager reportTableManager;
 
     public void setReportTableManager( ReportTableManager reportTableManager )
@@ -418,92 +409,6 @@
     }
 
     // -------------------------------------------------------------------------
-    // ChartGroup
-    // -------------------------------------------------------------------------
-
-    public int addChartGroup( ChartGroup chartGroup )
-    {
-        return chartGroupStore.save( chartGroup );
-    }
-
-    public void updateChartGroup( ChartGroup chartGroup )
-    {
-        chartGroupStore.update( chartGroup );
-    }
-
-    public void deleteChartGroup( ChartGroup chartGroup )
-    {
-        chartGroupStore.delete( chartGroup );
-    }
-
-    public ChartGroup getChartGroup( int id )
-    {
-        return chartGroupStore.get( id );
-    }
-
-    public ChartGroup getChartGroupByName( String name )
-    {
-        return chartGroupStore.getByName( name );
-    }
-
-    public Collection<ChartGroup> getAllChartGroups()
-    {
-        return chartGroupStore.getAll();
-    }
-
-    public Collection<ChartGroup> getChartGroups( final Collection<Integer> identifiers )
-    {
-        Collection<ChartGroup> groups = getAllChartGroups();
-
-        return identifiers == null ? groups : FilterUtils.filter( groups, new Filter<ChartGroup>()
-        {
-            public boolean retain( ChartGroup object )
-            {
-                return identifiers.contains( object.getId() );
-            }
-        } );
-    }
-
-    public Collection<ChartGroup> getGroupsContainingChart( Chart chart )
-    {
-        Collection<ChartGroup> groups = getAllChartGroups();
-
-        Iterator<ChartGroup> iterator = groups.iterator();
-
-        while ( iterator.hasNext() )
-        {
-            ChartGroup group = iterator.next();
-
-            if ( !group.getMembers().contains( chart ) )
-            {
-                iterator.remove();
-            }
-        }
-
-        return groups;
-    }
-
-    public int getChartGroupCount()
-    {
-        return chartGroupStore.getCount();
-    }
-
-    public int getChartGroupCountByName( String name )
-    {
-        return chartGroupStore.getCountByName( name );
-    }
-
-    public Collection<ChartGroup> getChartGroupsBetween( int first, int max )
-    {
-        return chartGroupStore.getBetween( first, max );
-    }
-
-    public Collection<ChartGroup> getChartGroupsBetweenByName( String name, int first, int max )
-    {
-        return chartGroupStore.getBetweenByName( name, first, max );
-    }
-
-    // -------------------------------------------------------------------------
     // Supportive methods
     // -------------------------------------------------------------------------
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2011-12-22 15:07:07 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2011-12-22 17:28:35 +0000
@@ -32,7 +32,6 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import net.sf.jasperreports.engine.JasperCompileManager;
@@ -49,7 +48,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.report.Report;
-import org.hisp.dhis.report.ReportGroup;
 import org.hisp.dhis.report.ReportService;
 import org.hisp.dhis.reporttable.ReportTable;
 import org.hisp.dhis.reporttable.ReportTableService;
@@ -78,13 +76,6 @@
         this.reportStore = reportStore;
     }
 
-    private GenericIdentifiableObjectStore<ReportGroup> reportGroupStore;
-
-    public void setReportGroupStore( GenericIdentifiableObjectStore<ReportGroup> reportGroupStore )
-    {
-        this.reportGroupStore = reportGroupStore;
-    }
-
     private ReportTableService reportTableService;
 
     public void setReportTableService( ReportTableService reportTableService )
@@ -242,95 +233,4 @@
             }
         } );
     }
-
-    // -------------------------------------------------------------------------
-    // ReportGroup
-    // -------------------------------------------------------------------------
-
-    public int addReportGroup( ReportGroup reportGroup )
-    {
-        return reportGroupStore.save( reportGroup );
-    }
-
-    public void updateReportGroup( ReportGroup reportGroup )
-    {
-        reportGroupStore.update( reportGroup );
-    }
-
-    public void deleteReportGroup( ReportGroup reportGroup )
-    {
-        reportGroupStore.delete( reportGroup );
-    }
-
-    public ReportGroup getReportGroup( int id )
-    {
-        return reportGroupStore.get( id );
-    }
-
-    public ReportGroup getReportGroup( String uid )
-    {
-        return reportGroupStore.getByUid( uid );
-    }
-
-    public ReportGroup getReportGroupByName( String name )
-    {
-        return reportGroupStore.getByName( name );
-    }
-
-    public Collection<ReportGroup> getAllReportGroups()
-    {
-        return reportGroupStore.getAll();
-    }
-
-    public Collection<ReportGroup> getReportGroups( final Collection<Integer> identifiers )
-    {
-        Collection<ReportGroup> groups = getAllReportGroups();
-
-        return identifiers == null ? groups : FilterUtils.filter( groups, new Filter<ReportGroup>()
-        {
-            public boolean retain( ReportGroup object )
-            {
-                return identifiers.contains( object.getId() );
-            }
-        } );
-    }
-
-    public Collection<ReportGroup> getGroupsContainingReport( Report report )
-    {
-        Collection<ReportGroup> groups = getAllReportGroups();
-
-        Iterator<ReportGroup> iterator = groups.iterator();
-
-        while ( iterator.hasNext() )
-        {
-            ReportGroup group = iterator.next();
-
-            if ( !group.getMembers().contains( report ) )
-            {
-                iterator.remove();
-            }
-        }
-
-        return groups;
-    }
-
-    public int getReportGroupCount()
-    {
-        return reportGroupStore.getCount();
-    }
-
-    public int getReportGroupCountByName( String name )
-    {
-        return reportGroupStore.getCountByName( name );
-    }
-
-    public Collection<ReportGroup> getReportGroupsBetween( int first, int max )
-    {
-        return reportGroupStore.getBetween( first, max );
-    }
-
-    public Collection<ReportGroup> getReportGroupsBetweenByName( String name, int first, int max )
-    {
-        return reportGroupStore.getBetweenByName( name, first, max );
-    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2011-12-22 15:07:07 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2011-12-22 17:28:35 +0000
@@ -68,7 +68,6 @@
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.report.ReportService;
 import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.reporttable.ReportTableGroup;
 import org.hisp.dhis.reporttable.ReportTableService;
 import org.hisp.dhis.reporttable.jdbc.ReportTableManager;
 import org.hisp.dhis.system.grid.ListGrid;
@@ -108,13 +107,6 @@
         this.reportTableStore = reportTableStore;
     }
 
-    private GenericIdentifiableObjectStore<ReportTableGroup> reportTableGroupStore;
-
-    public void setReportTableGroupStore( GenericIdentifiableObjectStore<ReportTableGroup> reportTableGroupStore )
-    {
-        this.reportTableGroupStore = reportTableGroupStore;
-    }
-
     protected ReportService reportService;
 
     public void setReportService( ReportService reportService )
@@ -280,97 +272,6 @@
     }
 
     // -------------------------------------------------------------------------
-    // ReportTableGroup
-    // -------------------------------------------------------------------------
-
-    public int addReportTableGroup( ReportTableGroup reportTableGroup )
-    {
-        return reportTableGroupStore.save( reportTableGroup );
-    }
-
-    public void updateReportTableGroup( ReportTableGroup reportTableGroup )
-    {
-        reportTableGroupStore.update( reportTableGroup );
-    }
-
-    public void deleteReportTableGroup( ReportTableGroup reportTableGroup )
-    {
-        reportTableGroupStore.delete( reportTableGroup );
-    }
-
-    public ReportTableGroup getReportTableGroup( int id )
-    {
-        return reportTableGroupStore.get( id );
-    }
-
-    public ReportTableGroup getReportTableGroup( String uid )
-    {
-        return reportTableGroupStore.getByUid( uid );
-    }
-
-    public ReportTableGroup getReportTableGroupByName( String name )
-    {
-        return reportTableGroupStore.getByName( name );
-    }
-
-    public Collection<ReportTableGroup> getAllReportTableGroups()
-    {
-        return reportTableGroupStore.getAll();
-    }
-
-    public Collection<ReportTableGroup> getReportTableGroups( final Collection<Integer> identifiers )
-    {
-        Collection<ReportTableGroup> groups = getAllReportTableGroups();
-
-        return identifiers == null ? groups : FilterUtils.filter( groups, new Filter<ReportTableGroup>()
-        {
-            public boolean retain( ReportTableGroup object )
-            {
-                return identifiers.contains( object.getId() );
-            }
-        } );
-    }
-
-    public Collection<ReportTableGroup> getGroupsContainingReportTable( ReportTable reportTable )
-    {
-        Collection<ReportTableGroup> groups = getAllReportTableGroups();
-
-        Iterator<ReportTableGroup> iterator = groups.iterator();
-
-        while ( iterator.hasNext() )
-        {
-            ReportTableGroup group = iterator.next();
-
-            if ( !group.getMembers().contains( reportTable ) )
-            {
-                iterator.remove();
-            }
-        }
-
-        return groups;
-    }
-
-    public int getReportTableGroupCount()
-    {
-        return reportTableGroupStore.getCount();
-    }
-
-    public int getReportTableGroupCountByName( String name )
-    {
-        return reportTableGroupStore.getCountByName( name );
-    }
-
-    public Collection<ReportTableGroup> getReportTableGroupsBetween( int first, int max )
-    {
-        return reportTableGroupStore.getBetween( first, max );
-    }
-
-    public Collection<ReportTableGroup> getReportTableGroupsBetweenByName( String name, int first, int max )
-    {
-        return reportTableGroupStore.getBetweenByName( name, first, max );
-    }
-
-    // -------------------------------------------------------------------------
     // Supportive methods
     // -------------------------------------------------------------------------
 

=== 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-12-22 17:00:08 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-12-22 17:28:35 +0000
@@ -25,16 +25,9 @@
     <property name="cacheable" value="true" />
   </bean>
 
-  <bean id="org.hisp.dhis.reporttable.ReportTableGroupStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.reporttable.ReportTableGroup" />
-    <property name="sessionFactory" ref="sessionFactory" />
-    <property name="cacheable" value="true" />
-  </bean>
-
   <bean id="org.hisp.dhis.reporttable.ReportTableService" class="org.hisp.dhis.reporttable.impl.DefaultReportTableService">
     <property name="reportTableManager" ref="org.hisp.dhis.reporttable.jdbc.ReportTableManager" />
     <property name="reportTableStore" ref="org.hisp.dhis.reporttable.ReportTableStore" />
-    <property name="reportTableGroupStore" ref="org.hisp.dhis.reporttable.ReportTableGroupStore" />
     <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
@@ -50,15 +43,8 @@
     <property name="cacheable" value="true" />
   </bean>
 
-  <bean id="org.hisp.dhis.report.ReportGroupStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.report.ReportGroup" />
-    <property name="sessionFactory" ref="sessionFactory" />
-    <property name="cacheable" value="true" />
-  </bean>
-
   <bean id="org.hisp.dhis.report.ReportService" class="org.hisp.dhis.report.impl.DefaultReportService">
     <property name="reportStore" ref="org.hisp.dhis.report.ReportStore" />
-    <property name="reportGroupStore" ref="org.hisp.dhis.report.ReportGroupStore" />
     <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
     <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
     <property name="statementManager" ref="statementManager" />
@@ -74,15 +60,8 @@
     <property name="cacheable" value="true" />
   </bean>
 
-  <bean id="org.hisp.dhis.chart.ChartGroupStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
-    <property name="clazz" value="org.hisp.dhis.chart.ChartGroup" />
-    <property name="sessionFactory" ref="sessionFactory" />
-    <property name="cacheable" value="true" />
-  </bean>
-
   <bean id="org.hisp.dhis.chart.ChartService" class="org.hisp.dhis.chart.impl.DefaultChartService">
     <property name="chartStore" ref="org.hisp.dhis.chart.ChartStore" />
-    <property name="chartGroupStore" ref="org.hisp.dhis.chart.ChartGroupStore" />
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
     <property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
     <property name="minMaxDataElementService" ref="org.hisp.dhis.minmax.MinMaxDataElementService" />

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2011-12-22 13:57:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2011-12-22 17:28:35 +0000
@@ -68,12 +68,6 @@
         foreign-key="fk_chart_organisationunits_organisationunitid" />
     </list>
 
-    <set name="groups" table="chartgroupmembers" inverse="true">
-      <cache usage="read-write" />
-      <key column="chartid" />
-      <many-to-many class="org.hisp.dhis.chart.ChartGroup" column="chartgroupid" />
-    </set>
-
     <component name="relatives">
       <property name="reportingMonth" />
       <property name="reportingQuarter" />

=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/ChartGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/ChartGroup.hbm.xml	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/ChartGroup.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.chart.ChartGroup" table="chartgroup">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="chartgroupid">
-      <generator class="native" />
-    </id>
-
-    <property name="name">
-      <column name="name" not-null="true" unique="true" length="230" />
-    </property>
-
-    <set name="members" table="chartgroupmembers">
-      <cache usage="read-write" />
-      <key column="chartgroupid" foreign-key="fk_chartgroupmembers_chartgroupid" />
-      <many-to-many class="org.hisp.dhis.chart.Chart" column="chartid" foreign-key="fk_chartgroup_chartid" />
-    </set>
-
-  </class>
-</hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml	2011-12-13 14:04:12 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml	2011-12-22 17:28:35 +0000
@@ -22,11 +22,5 @@
 	  
 	<property name="usingOrgUnitGroupSets"/>
 	  
-	<set name="groups" table="reportgroupmembers" inverse="true">
-	  <cache usage="read-write" />
-	  <key column="reportid" />
-	  <many-to-many class="org.hisp.dhis.report.ReportGroup" column="reportgroupid" />
-	</set>
-	
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/ReportGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/ReportGroup.hbm.xml	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/ReportGroup.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.report.ReportGroup" table="reportgroup">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="reportgroupid">
-      <generator class="native" />
-    </id>
-
-    <property name="name">
-      <column name="name" not-null="true" unique="true" length="230" />
-    </property>
-
-    <set name="members" table="reportgroupmembers">
-      <cache usage="read-write" />
-      <key column="reportgroupid" foreign-key="fk_reportgroupmembers_reportgroupid" />
-      <many-to-many class="org.hisp.dhis.report.Report" column="reportid" foreign-key="fk_reportgroup_reportid" />
-    </set>
-
-  </class>
-</hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml	2011-12-13 14:04:12 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml	2011-12-22 17:28:35 +0000
@@ -55,12 +55,6 @@
       <many-to-many column="organisationunitid" class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_reporttable_organisationunits_organisationunitid" />
     </list>
 
-	<set name="groups" table="reporttablegroupmembers" inverse="true">
-	  <cache usage="read-write" />
-	  <key column="reporttableid" />
-	  <many-to-many class="org.hisp.dhis.reporttable.ReportTableGroup" column="reporttablegroupid" />
-	</set>
-	
     <property name="doIndicators" />
 
     <property name="doPeriods" />

=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTableGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTableGroup.hbm.xml	2011-07-21 03:29:35 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTableGroup.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.reporttable.ReportTableGroup" table="reporttablegroup">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="reporttablegroupid">
-      <generator class="native" />
-    </id>
-
-    <property name="name">
-      <column name="name" not-null="true" unique="true" length="230" />
-    </property>
-
-    <set name="members" table="reporttablegroupmembers">
-      <cache usage="read-write" />
-      <key column="reporttablegroupid" foreign-key="fk_reporttablegroupmembers_reporttablegroupid" />
-      <many-to-many class="org.hisp.dhis.reporttable.ReportTable" column="reporttableid" foreign-key="fk_reporttablegroup_reporttableid" />
-    </set>
-
-  </class>
-</hibernate-mapping>

=== 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-12-21 04:38:18 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2011-12-22 17:28:35 +0000
@@ -29,7 +29,6 @@
 
 import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
 import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartGroup;
 import org.hisp.dhis.concept.Concept;
 import org.hisp.dhis.constant.Constant;
 import org.hisp.dhis.datadictionary.DataDictionary;
@@ -79,9 +78,7 @@
 import org.hisp.dhis.relationship.Relationship;
 import org.hisp.dhis.relationship.RelationshipType;
 import org.hisp.dhis.report.Report;
-import org.hisp.dhis.report.ReportGroup;
 import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.reporttable.ReportTableGroup;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserAuthorityGroup;
 import org.hisp.dhis.user.UserCredentials;
@@ -125,15 +122,6 @@
         return null;
     }
 
-    public void deleteChartGroup( ChartGroup group )
-    {
-    }
-
-    public String allowDeleteChartGroup( ChartGroup group )
-    {
-        return null;
-    }
-
     public void deleteDataDictionary( DataDictionary dataDictionary )
     {
     }
@@ -377,15 +365,6 @@
         return null;
     }
 
-    public void deleteReportGroup( ReportGroup group )
-    {
-    }
-
-    public String allowDeleteReportGroup( ReportGroup group )
-    {
-        return null;
-    }
-
     public void deleteReportTable( ReportTable reportTable )
     {
     }
@@ -395,15 +374,6 @@
         return null;
     }
 
-    public void deleteReportTableGroup( ReportTableGroup group )
-    {
-    }
-
-    public String allowDeleteReportTableGroup( ReportTableGroup group )
-    {
-        return null;
-    }
-
     public void deleteUser( User user )
     {
     }

=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup'
=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action'
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/AddChartGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/AddChartGroupAction.java	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/AddChartGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class AddChartGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-    
-    private ChartGroup chartGroup;
-    
-    public ChartGroup getChartGroup()
-    {
-        return chartGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-   
-    public String execute()
-    {
-        chartGroup = new ChartGroup( name );
-        
-        for ( String id : groupMembers )
-        {
-            chartGroup.addChart( chartService.getChart( Integer.parseInt( id ) ) );
-        }
-
-        chartService.addChartGroup( chartGroup );        
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetChartGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ChartGroup chartGroup;
-
-    public ChartGroup getChartGroup()
-    {
-        return chartGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        chartGroup = chartService.getChartGroup( id );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java	2011-09-23 18:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.chart.comparator.ChartGroupNameComparator;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetChartGroupListAction
-    extends ActionPagingSupport<ChartGroup>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input & Output
-    // -------------------------------------------------------------------------
-
-    private List<ChartGroup> chartGroups;
-
-    public List<ChartGroup> getChartGroups()
-    {
-        return chartGroups;
-    }
-    
-    private String key;
-    
-    public String getKey()
-    {
-        return key;
-    }
-
-    public void setKey( String key )
-    {
-        this.key = key;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( isNotBlank( key ) ) // Filter on key only if set
-        {
-            this.paging = createPaging( chartService.getChartGroupCountByName( key ) );
-            
-            chartGroups = new ArrayList<ChartGroup>( chartService.getChartGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
-        }
-        else
-        {
-            this.paging = createPaging( chartService.getChartGroupCount() );
-            
-            chartGroups = new ArrayList<ChartGroup>( chartService.getChartGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
-        }
-
-        Collections.sort( chartGroups, new ChartGroupNameComparator() );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/RemoveChartGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/RemoveChartGroupAction.java	2011-09-29 07:41:04 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/RemoveChartGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.DeleteNotAllowedException;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class RemoveChartGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-
-    // -------------------------------------------------------------------------
-    // I18n
-    // -------------------------------------------------------------------------
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        try
-        {
-            chartService.deleteChartGroup( chartService.getChartGroup( id ) );
-        }
-        catch ( DeleteNotAllowedException ex )
-        {
-            if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
-            {
-                message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "item_deleted_successfully" );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java	2011-11-12 18:43:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2004-2011, 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.
- */
-
-package org.hisp.dhis.reporting.chartgroup.action;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-import org.hisp.dhis.chart.comparator.ChartNameComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ShowUpdateChartGroupFormAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ChartGroup chartGroup;
-
-    public ChartGroup getChartGroup()
-    {
-        return chartGroup;
-    }
-
-    private List<Chart> groupMembers = new ArrayList<Chart>();
-
-    public List<Chart> getGroupMembers()
-    {
-        return groupMembers;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        chartGroup = chartService.getChartGroup( id );
-
-        groupMembers = new ArrayList<Chart>( chartGroup.getMembers() );
-
-        Collections.sort( groupMembers, new ChartNameComparator() );
-
-        return SUCCESS;
-    }
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/UpdateChartGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/UpdateChartGroupAction.java	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/UpdateChartGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class UpdateChartGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-
-    private ChartGroup chartGroup;
-
-    public ChartGroup getChartGroup()
-    {
-        return chartGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        chartGroup = chartService.getChartGroup( id );
-
-        if ( name != null && name.trim().length() > 0 )
-        {
-            chartGroup.setName( name );
-        }
-
-        Set<Chart> members = new HashSet<Chart>();
-
-        for ( String memberId : groupMembers )
-        {
-            members.add( chartService.getChart( Integer.parseInt( memberId ) ) );
-        }
-
-        chartGroup.updateCharts( members );
-
-        chartService.updateChartGroup( chartGroup );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ValidateChartGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ValidateChartGroupAction.java	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ValidateChartGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-package org.hisp.dhis.reporting.chartgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.i18n.I18n;
-import org.hisp.dhis.chart.ChartGroup;
-import org.hisp.dhis.chart.ChartService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ValidateChartGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ChartService chartService;
-
-    public void setChartService( ChartService chartService )
-    {
-        this.chartService = chartService;
-    }
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( name != null )
-        {
-            ChartGroup match = chartService.getChartGroupByName( name );
-
-            if ( match != null && (id == null || match.getId() != id) )
-            {
-                message = i18n.getString( "name_in_use" );
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "everything_is_ok" );
-
-        return SUCCESS;
-    }
-}

=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup'
=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action'
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/AddReportGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/AddReportGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/AddReportGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class AddReportGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-    
-    private ReportGroup reportGroup;
-    
-    public ReportGroup getReportGroup()
-    {
-        return reportGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-   
-    public String execute()
-    {
-        reportGroup = new ReportGroup( name );
-        
-        for ( String id : groupMembers )
-        {
-            reportGroup.addReport( reportService.getReport( Integer.parseInt( id ) ) );
-        }
-
-        reportService.addReportGroup( reportGroup );        
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetReportGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ReportGroup reportGroup;
-
-    public ReportGroup getReportGroup()
-    {
-        return reportGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportGroup = reportService.getReportGroup( id );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java	2011-09-23 18:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-import org.hisp.dhis.report.comparator.ReportGroupNameComparator;
-import org.hisp.dhis.paging.ActionPagingSupport;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetReportGroupListAction
-    extends ActionPagingSupport<ReportGroup>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input & Output
-    // -------------------------------------------------------------------------
-
-    private List<ReportGroup> reportGroups;
-
-    public List<ReportGroup> getReportGroups()
-    {
-        return reportGroups;
-    }
-    
-    private String key;
-    
-    public String getKey()
-    {
-        return key;
-    }
-
-    public void setKey( String key )
-    {
-        this.key = key;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( isNotBlank( key ) ) // Filter on key only if set
-        {
-            this.paging = createPaging( reportService.getReportGroupCountByName( key ) );
-            
-            reportGroups = new ArrayList<ReportGroup>( reportService.getReportGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
-        }
-        else
-        {
-            this.paging = createPaging( reportService.getReportGroupCount() );
-            
-            reportGroups = new ArrayList<ReportGroup>( reportService.getReportGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
-        }
-
-        Collections.sort( reportGroups, new ReportGroupNameComparator() );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/RemoveReportGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/RemoveReportGroupAction.java	2011-09-29 07:41:04 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/RemoveReportGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.DeleteNotAllowedException;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class RemoveReportGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-
-    // -------------------------------------------------------------------------
-    // I18n
-    // -------------------------------------------------------------------------
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        try
-        {
-            reportService.deleteReportGroup( reportService.getReportGroup( id ) );
-        }
-        catch ( DeleteNotAllowedException ex )
-        {
-            if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
-            {
-                message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "item_deleted_successfully" );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ShowUpdateReportGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ShowUpdateReportGroupFormAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ShowUpdateReportGroupFormAction.java	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2004-2011, 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.
- */
-
-package org.hisp.dhis.reporting.reportgroup.action;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ShowUpdateReportGroupFormAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Comparator
-    // -------------------------------------------------------------------------
-
-    private Comparator<Report> reportComparator;
-
-    public void setReportComparator( Comparator<Report> reportComparator )
-    {
-        this.reportComparator = reportComparator;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ReportGroup reportGroup;
-
-    public ReportGroup getReportGroup()
-    {
-        return reportGroup;
-    }
-
-    private List<Report> groupMembers = new ArrayList<Report>();
-
-    public List<Report> getGroupMembers()
-    {
-        return groupMembers;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportGroup = reportService.getReportGroup( id );
-
-        groupMembers = new ArrayList<Report>( reportGroup.getMembers() );
-
-        Collections.sort( groupMembers, reportComparator );
-
-        return SUCCESS;
-    }
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/UpdateReportGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/UpdateReportGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/UpdateReportGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class UpdateReportGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-
-    private ReportGroup reportGroup;
-
-    public ReportGroup getReportGroup()
-    {
-        return reportGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportGroup = reportService.getReportGroup( id );
-
-        if ( name != null && name.trim().length() > 0 )
-        {
-            reportGroup.setName( name );
-        }
-
-        Set<Report> members = new HashSet<Report>();
-
-        for ( String memberId : groupMembers )
-        {
-            members.add( reportService.getReport( Integer.parseInt( memberId ) ) );
-        }
-
-        reportGroup.updateReports( members );
-
-        reportService.updateReportGroup( reportGroup );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ValidateReportGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ValidateReportGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/ValidateReportGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-package org.hisp.dhis.reporting.reportgroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.i18n.I18n;
-import org.hisp.dhis.report.ReportGroup;
-import org.hisp.dhis.report.ReportService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ValidateReportGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportService reportService;
-
-    public void setReportService( ReportService reportService )
-    {
-        this.reportService = reportService;
-    }
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( name != null )
-        {
-            ReportGroup match = reportService.getReportGroupByName( name );
-
-            if ( match != null && (id == null || match.getId() != id) )
-            {
-                message = i18n.getString( "name_in_use" );
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "everything_is_ok" );
-
-        return SUCCESS;
-    }
-}

=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup'
=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action'
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/AddReportTableGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/AddReportTableGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/AddReportTableGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class AddReportTableGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-    
-    private ReportTableGroup reportTableGroup;
-    
-    public ReportTableGroup getReportTableGroup()
-    {
-        return reportTableGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-   
-    public String execute()
-    {
-        reportTableGroup = new ReportTableGroup( name );
-        
-        for ( String id : groupMembers )
-        {
-            reportTableGroup.addReportTable( reportTableService.getReportTable( Integer.parseInt( id ) ) );
-        }
-
-        reportTableService.addReportTableGroup( reportTableGroup );        
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetReportTableGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ReportTableGroup reportTableGroup;
-
-    public ReportTableGroup getReportTableGroup()
-    {
-        return reportTableGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportTableGroup = reportTableService.getReportTableGroup( id );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java	2011-09-23 18:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.paging.ActionPagingSupport;
-import org.hisp.dhis.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-import org.hisp.dhis.reporttable.comparator.ReportTableGroupNameComparator;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetReportTableGroupListAction
-    extends ActionPagingSupport<ReportTableGroup>
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Input & Output
-    // -------------------------------------------------------------------------
-
-    private List<ReportTableGroup> reportTableGroups;
-
-    public List<ReportTableGroup> getReportTableGroups()
-    {
-        return reportTableGroups;
-    }
-    
-    private String key;
-    
-    public String getKey()
-    {
-        return key;
-    }
-
-    public void setKey( String key )
-    {
-        this.key = key;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( isNotBlank( key ) ) // Filter on key only if set
-        {
-            this.paging = createPaging( reportTableService.getReportTableGroupCountByName( key ) );
-            
-            reportTableGroups = new ArrayList<ReportTableGroup>( reportTableService.getReportTableGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
-        }
-        else
-        {
-            this.paging = createPaging( reportTableService.getReportTableGroupCount() );
-            
-            reportTableGroups = new ArrayList<ReportTableGroup>( reportTableService.getReportTableGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
-        }
-
-        Collections.sort( reportTableGroups, new ReportTableGroupNameComparator() );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/RemoveReportTableGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/RemoveReportTableGroupAction.java	2011-09-29 07:41:04 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/RemoveReportTableGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.DeleteNotAllowedException;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class RemoveReportTableGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-
-    // -------------------------------------------------------------------------
-    // I18n
-    // -------------------------------------------------------------------------
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        try
-        {
-            reportTableService.deleteReportTableGroup( reportTableService.getReportTableGroup( id ) );
-        }
-        catch ( DeleteNotAllowedException ex )
-        {
-            if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
-            {
-                message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "item_deleted_successfully" );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ShowUpdateReportTableGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ShowUpdateReportTableGroupFormAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ShowUpdateReportTableGroupFormAction.java	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2004-2011, 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.
- */
-
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ShowUpdateReportTableGroupFormAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Comparator
-    // -------------------------------------------------------------------------
-
-    private Comparator<ReportTable> reportTableComparator;
-
-    public void setReportTableComparator( Comparator<ReportTable> reportTableComparator )
-    {
-        this.reportTableComparator = reportTableComparator;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private ReportTableGroup reportTableGroup;
-
-    public ReportTableGroup getReportTableGroup()
-    {
-        return reportTableGroup;
-    }
-
-    private List<ReportTable> groupMembers = new ArrayList<ReportTable>();
-
-    public List<ReportTable> getGroupMembers()
-    {
-        return groupMembers;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportTableGroup = reportTableService.getReportTableGroup( id );
-
-        groupMembers = new ArrayList<ReportTable>( reportTableGroup.getMembers() );
-
-        Collections.sort( groupMembers, reportTableComparator );
-
-        return SUCCESS;
-    }
-}
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/UpdateReportTableGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/UpdateReportTableGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/UpdateReportTableGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.HashSet;
-import java.util.Set;
-
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class UpdateReportTableGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private Set<String> groupMembers = new HashSet<String>();
-
-    public void setGroupMembers( Set<String> groupMembers )
-    {
-        this.groupMembers = groupMembers;
-    }
-
-    private ReportTableGroup reportTableGroup;
-
-    public ReportTableGroup getReportTableGroup()
-    {
-        return reportTableGroup;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        reportTableGroup = reportTableService.getReportTableGroup( id );
-
-        if ( name != null && name.trim().length() > 0 )
-        {
-            reportTableGroup.setName( name );
-        }
-
-        Set<ReportTable> members = new HashSet<ReportTable>();
-
-        for ( String memberId : groupMembers )
-        {
-            members.add( reportTableService.getReportTable( Integer.parseInt( memberId ) ) );
-        }
-
-        reportTableGroup.updateReportTables( members );
-
-        reportTableService.updateReportTableGroup( reportTableGroup );
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ValidateReportTableGroupAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ValidateReportTableGroupAction.java	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/ValidateReportTableGroupAction.java	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-package org.hisp.dhis.reporting.reporttablegroup.action;
-
-/*
- * Copyright (c) 2004-2011, 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.i18n.I18n;
-import org.hisp.dhis.reporttable.ReportTableGroup;
-import org.hisp.dhis.reporttable.ReportTableService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-
-public class ValidateReportTableGroupAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ReportTableService reportTableService;
-
-    public void setReportTableService( ReportTableService reportTableService )
-    {
-        this.reportTableService = reportTableService;
-    }
-
-    private I18n i18n;
-
-    public void setI18n( I18n i18n )
-    {
-        this.i18n = i18n;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input
-    // -------------------------------------------------------------------------
-
-    private Integer id;
-
-    public void setId( Integer id )
-    {
-        this.id = id;
-    }
-
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-    {
-        if ( name != null )
-        {
-            ReportTableGroup match = reportTableService.getReportTableGroupByName( name );
-
-            if ( match != null && (id == null || match.getId() != id) )
-            {
-                message = i18n.getString( "name_in_use" );
-
-                return ERROR;
-            }
-        }
-
-        message = i18n.getString( "everything_is_ok" );
-
-        return SUCCESS;
-    }
-}

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-12-22 16:01:28 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-12-22 17:28:35 +0000
@@ -95,43 +95,6 @@
     <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
   </bean>
   
-  <!-- ChartGroups -->
-
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupAction" class="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupListAction" class="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupListAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.ValidateChartGroupAction" class="org.hisp.dhis.reporting.chartgroup.action.ValidateChartGroupAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.AddChartGroupAction" class="org.hisp.dhis.reporting.chartgroup.action.AddChartGroupAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.ShowUpdateChartGroupFormAction" class="org.hisp.dhis.reporting.chartgroup.action.ShowUpdateChartGroupFormAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.UpdateChartGroupAction" class="org.hisp.dhis.reporting.chartgroup.action.UpdateChartGroupAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-    
-  <bean id="org.hisp.dhis.reporting.chartgroup.action.RemoveChartGroupAction" class="org.hisp.dhis.reporting.chartgroup.action.RemoveChartGroupAction"
-    scope="prototype">
-    <property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
-  </bean>
-  
   <!-- TableCreator -->
 
   <bean id="org.hisp.dhis.reporting.tablecreator.action.GetTableOptionsAction" class="org.hisp.dhis.reporting.tablecreator.action.GetTableOptionsAction"
@@ -212,43 +175,6 @@
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
   </bean>
   
-  <!-- ReportTableGroups -->
-
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupAction" class="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupListAction" class="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupListAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.ValidateReportTableGroupAction" class="org.hisp.dhis.reporting.reporttablegroup.action.ValidateReportTableGroupAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.AddReportTableGroupAction" class="org.hisp.dhis.reporting.reporttablegroup.action.AddReportTableGroupAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.ShowUpdateReportTableGroupFormAction" class="org.hisp.dhis.reporting.reporttablegroup.action.ShowUpdateReportTableGroupFormAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.UpdateReportTableGroupAction" class="org.hisp.dhis.reporting.reporttablegroup.action.UpdateReportTableGroupAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-    
-  <bean id="org.hisp.dhis.reporting.reporttablegroup.action.RemoveReportTableGroupAction" class="org.hisp.dhis.reporting.reporttablegroup.action.RemoveReportTableGroupAction"
-    scope="prototype">
-    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
-  </bean>
-  
   <!-- Report -->
 
   <bean id="org.hisp.dhis.reporting.reportviewer.action.AddReportAction" class="org.hisp.dhis.reporting.reportviewer.action.AddReportAction"
@@ -300,43 +226,6 @@
     <property name="reportService" ref="org.hisp.dhis.report.ReportService" />	
   </bean>
   
-  <!-- ReportGroups -->
-
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupAction" class="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupListAction" class="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupListAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.ValidateReportGroupAction" class="org.hisp.dhis.reporting.reportgroup.action.ValidateReportGroupAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.AddReportGroupAction" class="org.hisp.dhis.reporting.reportgroup.action.AddReportGroupAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.ShowUpdateReportGroupFormAction" class="org.hisp.dhis.reporting.reportgroup.action.ShowUpdateReportGroupFormAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-  
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.UpdateReportGroupAction" class="org.hisp.dhis.reporting.reportgroup.action.UpdateReportGroupAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-    
-  <bean id="org.hisp.dhis.reporting.reportgroup.action.RemoveReportGroupAction" class="org.hisp.dhis.reporting.reportgroup.action.RemoveReportGroupAction"
-    scope="prototype">
-    <property name="reportService" ref="org.hisp.dhis.report.ReportService" />
-  </bean>
-  
   <!-- PivotTable -->
 
   <bean id="org.hisp.dhis.reporting.pivottable.action.GetPivotTableOptionsAction" class="org.hisp.dhis.reporting.pivottable.action.GetPivotTableOptionsAction"

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-11-10 18:46:58 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-12-22 17:28:35 +0000
@@ -114,62 +114,6 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
     
-	<!-- ChartGroup -->
-	
-    <action name="chartGroup" class="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupListAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/chartGroup.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-      <param name="javascripts">javascript/chartGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
-    </action>
-
-    <action name="removeChartGroup" class="org.hisp.dhis.reporting.chartgroup.action.RemoveChartGroupAction">
-      <result name="success" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
-    </action>
-
-    <action name="showAddChartGroupForm" class="org.hisp.dhis.reporting.chart.action.GetAllChartsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/addChartGroupForm.vm</param>
-      <param name="javascripts">javascript/chartGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="addChartGroup" class="org.hisp.dhis.reporting.chartgroup.action.AddChartGroupAction">
-      <result name="success" type="redirect">chartGroup.action</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="showUpdateChartGroupForm" class="org.hisp.dhis.reporting.chartgroup.action.ShowUpdateChartGroupFormAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/updateChartGroupForm.vm</param>
-      <param name="javascripts">javascript/chartGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-
-    <action name="updateChartGroup" class="org.hisp.dhis.reporting.chartgroup.action.UpdateChartGroupAction">
-      <result name="success" type="redirect">chartGroup.action</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-	
-	<action name="getChartGroup" class="org.hisp.dhis.reporting.chartgroup.action.GetChartGroupAction">
-      <result name="success" type="velocity-json">/dhis-web-reporting/jsonChartGroup.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-    <action name="validateChartGroup" class="org.hisp.dhis.reporting.chartgroup.action.ValidateChartGroupAction">
-      <result name="success" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-	
     <!-- Report -->
 
     <action name="displayAddReportForm" class="org.hisp.dhis.reporting.reportviewer.action.GetReportOptionsAction">
@@ -230,62 +174,6 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
 	
-	<!-- ReportGroup -->
-	
-    <action name="reportGroup" class="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupListAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/reportGroup.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-      <param name="javascripts">javascript/reportGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
-    </action>
-
-    <action name="removeReportGroup" class="org.hisp.dhis.reporting.reportgroup.action.RemoveReportGroupAction">
-      <result name="success" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
-    </action>
-
-    <action name="showAddReportGroupForm" class="org.hisp.dhis.reporting.reportviewer.action.GetAllReportsAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/addReportGroupForm.vm</param>
-      <param name="javascripts">javascript/reportGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="addReportGroup" class="org.hisp.dhis.reporting.reportgroup.action.AddReportGroupAction">
-      <result name="success" type="redirect">reportGroup.action</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="showUpdateReportGroupForm" class="org.hisp.dhis.reporting.reportgroup.action.ShowUpdateReportGroupFormAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/updateReportGroupForm.vm</param>
-      <param name="javascripts">javascript/reportGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-
-    <action name="updateReportGroup" class="org.hisp.dhis.reporting.reportgroup.action.UpdateReportGroupAction">
-      <result name="success" type="redirect">reportGroup.action</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-	
-	<action name="getReportGroup" class="org.hisp.dhis.reporting.reportgroup.action.GetReportGroupAction">
-      <result name="success" type="velocity-json">/dhis-web-reporting/jsonReportGroup.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-    <action name="validateReportGroup" class="org.hisp.dhis.reporting.reportgroup.action.ValidateReportGroupAction">
-      <result name="success" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-	
     <!-- ReportTable -->
 
     <action name="displayManageTableForm" class="org.hisp.dhis.reporting.tablecreator.action.GetAllTablesAction">
@@ -371,63 +259,6 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
     
-	<!-- ReportTableGroup -->
-	
-    <action name="reportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupListAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/reportTableGroup.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-      <param name="javascripts">javascript/reportTableGroup.js</param>
-      <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
-    </action>
-
-    <action name="removeReportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.RemoveReportTableGroupAction">
-      <result name="success" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
-    </action>
-
-    <action name="showAddReportTableGroupForm" class="org.hisp.dhis.reporting.tablecreator.action.GetAllTablesAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/addReportTableGroupForm.vm</param>
-      <param name="javascripts">javascript/reportTableGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="addReportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.AddReportTableGroupAction">
-      <result name="success" type="redirect">reportTableGroup.action</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
-    </action>
-
-    <action name="showUpdateReportTableGroupForm" class="org.hisp.dhis.reporting.reporttablegroup.action.ShowUpdateReportTableGroupFormAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/updateReportTableGroupForm.vm</param>
-      <param name="javascripts">javascript/reportTableGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-
-    <action name="updateReportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.UpdateReportTableGroupAction">
-      <result name="success" type="redirect">reportTableGroup.action
-			</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
-    </action>
-	
-	<action name="getReportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.GetReportTableGroupAction">
-      <result name="success" type="velocity-json">/dhis-web-reporting/jsonReportTableGroup.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-    <action name="validateReportTableGroup" class="org.hisp.dhis.reporting.reporttablegroup.action.ValidateReportTableGroupAction">
-      <result name="success" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <result name="error" type="velocity-json">
-		/dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-	
     <!-- PivotTable -->
 
     <action name="displayPivotTableForm" class="org.hisp.dhis.reporting.pivottable.action.GetPivotTableOptionsAction">

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartGroupForm.vm	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartGroupForm.vm	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<script type="text/javascript" src="javascript/addChartGroupForm.js"></script>
-<script type="text/javascript">
-	jQuery(function() {
-		jQuery("#availableChartsList").dhisAjaxSelect({
-			source: "getCharts.action",
-			iterator: "charts",
-			connectedTo: 'groupMembers',
-			handler: function(item) {
-				var option = jQuery("<option />");
-				option.text( item.name );
-				option.attr( "value", item.id );
-
-				return option;
-			}
-		});
-	});
-</script>
-
-<h3>$i18n.getString( "create_new_chart_group" )</h3>
-
-<form id="addChartGroupForm" action="addChartGroup.action" method="post" >
-
-<table>
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
-	<tr>
-		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" style="width:20em"/></td>
-	</tr>
-	<tr>
-		<td colspan="2" height="15px"></td>
-	</tr>
-</table>
-
-<table>
-    <col style="width: 450px"/>
-    <col/>
-    <col style="width: 450px"/>
-
-	<tr>
-		<th>$i18n.getString( "available_charts" )</th>
-		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
-	</tr>
-
-	<tr>
-		<td>
-			<select id="availableChartsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
-		</td>
-		
-        <td style="text-align:center">          
-        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableChartsList' );"/><br/>
-            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'groupMembers' );"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableChartsList' );"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'groupMembers' );"/>
-        </td>
-    
-		<td>
-			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;"></select>
-		</td>
-	</tr>
-</table>
-
-<p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='chartGroup.action'" style="width:10em"/>
-</p>
-
-</form>

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportGroupForm.vm	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportGroupForm.vm	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<script type="text/javascript" src="javascript/addReportGroupForm.js"></script>
-<script type="text/javascript">
-	jQuery(function() {
-		jQuery("#availableReportsList").dhisAjaxSelect({
-			source: "getReports.action",
-			iterator: "reports",
-			connectedTo: 'groupMembers',
-			handler: function(item) {
-				var option = jQuery("<option />");
-				option.text( item.name );
-				option.attr( "value", item.id );
-
-				return option;
-			}
-		});
-	});
-</script>
-
-<h3>$i18n.getString( "create_new_report_group" )</h3>
-
-<form id="addReportGroupForm" action="addReportGroup.action" method="post" >
-
-<table>
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
-	<tr>
-		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" style="width:20em"/></td>
-	</tr>
-	<tr>
-		<td colspan="2" height="15px"></td>
-	</tr>
-</table>
-
-<table>
-    <col style="width: 450px"/>
-    <col/>
-    <col style="width: 450px"/>
-
-	<tr>
-		<th>$i18n.getString( "available_reports" )</th>
-		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
-	</tr>
-
-	<tr>
-		<td>
-			<select id="availableReportsList" multiple="multiple" style="height: 200px; width: 100%;"></select>
-		</td>
-		
-        <td style="text-align:center">          
-        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableReportsList' );"/><br/>
-            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'groupMembers' );"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableReportsList' );"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'groupMembers' );"/>
-        </td>
-    
-		<td>
-			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;"></select>
-		</td>
-	</tr>
-</table>
-
-<p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='reportGroup.action'" style="width:10em"/>
-</p>
-
-</form>

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm	2011-07-22 07:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportTableGroupForm.vm	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<script type="text/javascript" src="javascript/addReportTableGroupForm.js"></script>
-<script type="text/javascript">
-	jQuery(function() {
-		jQuery("#availableReportTablesList").dhisAjaxSelect({
-			source: "getReportTables.action",
-			iterator: "reportTables",
-			connectedTo: 'groupMembers',
-			handler: function(item) {
-				var option = jQuery("<option />");
-				option.text( item.name );
-				option.attr( "value", item.id );
-
-				return option;
-			}
-		});
-	});
-</script>
-
-<h3>$i18n.getString( "create_new_report_table_group" )</h3>
-
-<form id="addReportTableGroupForm" action="addReportTableGroup.action" method="post" >
-
-<table>
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
-	<tr>
-		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" style="width:20em"/></td>
-	</tr>
-	<tr>
-		<td colspan="2" height="15px"></td>
-	</tr>
-</table>
-
-<table>
-    <col style="width: 450px"/>
-    <col/>
-    <col style="width: 450px"/>
-
-	<tr>
-		<th>$i18n.getString( "available_report_tables" )</th>
-		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
-	</tr>
-
-	<tr>
-		<td>
-			<select id="availableReportTablesList" multiple="multiple" style="height: 200px; width: 100%;"></select>
-		</td>
-		
-        <td style="text-align:center">          
-        	<input type="button" value="&gt;" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableReportTablesList' );"/><br/>
-            <input type="button" value="&lt;" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'groupMembers' );"/><br/>
-			<input type="button" value="&gt;&gt;" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableReportTablesList' );"/><br/>
-			<input type="button" value="&lt;&lt;" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'groupMembers' );"/>
-        </td>
-    
-		<td>
-			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;"></select>
-		</td>
-	</tr>
-</table>
-
-<p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='reportTableGroup.action'" style="width:10em"/>
-</p>
-
-</form>

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/chartGroup.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/chartGroup.vm	2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/chartGroup.vm	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-<script type="text/javascript">
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
-	
-	jQuery(document).ready(function() {
-		tableSorter( 'listTable' );
-	});
-</script>
-
-<h3>$i18n.getString( "chart_group_management" ) #openHelp( "chart_group" )</h3>
-
-<table class="mainPageTable">
-	<tr>
-		<td style="vertical-align:top">
-			<table width="100%">
-				<tr>
-					<td>#filterDiv( "chartGroup" )</td>
-					<td colspan="9" style="text-align:right">
-						<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddChartGroupForm.action'" style="width:80px"/></a>
-					</td>
-				</tr>
-			</table>
-			<table class="listTable" id="listTable">
-				<col/>          
-				<col width="100"/>
-				<thead>
-					<tr>
-						<th>$i18n.getString( "name" )</th>
-						<th style="text-align:center" class="{sorter: false}">$i18n.getString( "operations" )</th>
-					</tr>
-				</thead>
-				<tbody id="list">
-					#foreach( $chartGroup in $chartGroups )
-					<tr id="tr${chartGroup.id}">
-						<td onclick="showChartGroupDetails( $chartGroup.id )">$encoder.htmlEncode( $chartGroup.name )</td>
-						<td style="text-align:center">
-							<a href="showUpdateChartGroupForm.action?id=$chartGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>               
-							<a href="javascript:removeChartGroup( '$chartGroup.id', '$encoder.jsEncode( $chartGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>               
-							<a href="javascript:showChartGroupDetails( $chartGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
-						</td>
-					</tr>
-				#end
-				</tbody>
-			</table>
-			<p></p>
-			#parse( "/dhis-web-commons/paging/paging.vm" )
-		</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( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
-			</div>
-
-		<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
-			<div style="float:right">
-				<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
-			</div>
-			<p><span id="warningField"></span></p>
-		</div>
-		</td>
-	</tr>
-</table>

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportGroup.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportGroup.vm	2011-07-21 09:09:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportGroup.vm	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-<script type="text/javascript">
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
-	
-	jQuery(document).ready(function() {
-		tableSorter( 'listTable' );
-	});
-</script>
-
-<h3>$i18n.getString( "report_group_management" ) #openHelp( "report_group" )</h3>
-
-<table class="mainPageTable">
-	<tr>
-		<td style="vertical-align:top">
-			<table width="100%">
-				<tr>
-					<td>#filterDiv( "reportGroup" )</td>
-					<td colspan="9" style="text-align:right">
-						<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddReportGroupForm.action'" style="width:80px"/></a>
-					</td>
-				</tr>
-			</table>
-			<table class="listTable" id="listTable">
-				<col/>          
-				<col width="100"/>
-				<thead>
-					<tr>
-						<th>$i18n.getString( "name" )</th>
-						<th style="text-align:center" class="{sorter: false}">$i18n.getString( "operations" )</th>
-					</tr>
-				</thead>
-				<tbody id="list">
-					#foreach( $reportGroup in $reportGroups )
-					<tr id="tr${reportGroup.id}">
-						<td onclick="showReportGroupDetails( $reportGroup.id )">$encoder.htmlEncode( $reportGroup.name )</td>
-						<td style="text-align:center">
-							<a href="showUpdateReportGroupForm.action?id=$reportGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>               
-							<a href="javascript:removeReportGroup( '$reportGroup.id', '$encoder.jsEncode( $reportGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>               
-							<a href="javascript:showReportGroupDetails( $reportGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
-						</td>
-					</tr>
-				#end
-				</tbody>
-			</table>
-			<p></p>
-			#parse( "/dhis-web-commons/paging/paging.vm" )
-		</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( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
-			</div>
-
-		<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
-			<div style="float:right">
-				<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
-			</div>
-			<p><span id="warningField"></span></p>
-		</div>
-		</td>
-	</tr>
-</table>

=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm	2011-07-22 07:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/reportTableGroup.vm	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-<script type="text/javascript">
-    var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete" ) , "'" )';
-	
-	jQuery(document).ready(function() {
-		tableSorter( 'listTable' );
-	});
-</script>
-
-<h3>$i18n.getString( "report_table_group_management" ) #openHelp( "report_table_group" )</h3>
-
-<table class="mainPageTable">
-	<tr>
-		<td style="vertical-align:top">
-			<table width="100%">
-				<tr>
-					<td>#filterDiv( "reportTableGroup" )</td>
-					<td colspan="9" style="text-align:right">
-						<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddReportTableGroupForm.action'" style="width:80px"/></a>
-					</td>
-				</tr>
-			</table>
-			<table class="listTable" id="listTable">
-				<col/>          
-				<col width="100"/>
-				<thead>
-					<tr>
-						<th>$i18n.getString( "name" )</th>
-						<th style="text-align:center" class="{sorter: false}">$i18n.getString( "operations" )</th>
-					</tr>
-				</thead>
-				<tbody id="list">
-					#foreach( $reportTableGroup in $reportTableGroups )
-					<tr id="tr${reportTableGroup.id}">
-						<td onclick="showReportTableGroupDetails( $reportTableGroup.id )">$encoder.htmlEncode( $reportTableGroup.name )</td>
-						<td style="text-align:center">
-							<a href="showUpdateReportTableGroupForm.action?id=$reportTableGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>               
-							<a href="javascript:removeReportTableGroup( '$reportTableGroup.id', '$encoder.jsEncode( $reportTableGroup.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>               
-							<a href="javascript:showReportTableGroupDetails( $reportTableGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
-						</td>
-					</tr>
-				#end
-				</tbody>
-			</table>
-			<p></p>
-			#parse( "/dhis-web-commons/paging/paging.vm" )
-		</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( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
-			</div>
-
-		<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
-			<div style="float:right">
-				<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
-			</div>
-			<p><span id="warningField"></span></p>
-		</div>
-		</td>
-	</tr>
-</table>