dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38542
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19639: moved MetaDataFilter files from commons.filter => common.filter, and removed package commons.filt...
------------------------------------------------------------
revno: 19639
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-07-14 14:33:21 +0700
message:
moved MetaDataFilter files from commons.filter => common.filter, and removed package commons.filter (it seems these files was put in the wrong package)
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilter.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilterService.java
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilter.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilterService.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MetaDataFilterSchemaDescriptor.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/commons/filter/DefaultMetaDataFilterService.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataFilterController.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/ShowUpdateFilterExportFormAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter'
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilter.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilter.java 2015-07-14 07:33:21 +0000
@@ -0,0 +1,101 @@
+package org.hisp.dhis.common.filter;
+
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import org.hisp.dhis.common.BaseNameableObject;
+import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+
+/**
+ * @author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>
+ */
+@JacksonXmlRootElement( localName = "filter", namespace = DxfNamespaces.DXF_2_0 )
+public class MetaDataFilter
+ extends BaseNameableObject
+{
+ /**
+ * Determines if a de-serialized file is compatible with this class.
+ */
+ private static final long serialVersionUID = 8736213901318412954L;
+
+ private String jsonFilter;
+
+ private Integer sortOrder;
+
+ //--------------------------------------------------------------------------
+ // Constructors
+ //--------------------------------------------------------------------------
+
+ public MetaDataFilter()
+ {
+ }
+
+ public MetaDataFilter( String name )
+ {
+ this.name = name;
+ }
+
+ public MetaDataFilter( String uid, String description, String name, String jsonFilter )
+ {
+ super( uid, description, name );
+ this.jsonFilter = jsonFilter;
+ }
+
+ // -------------------------------------------------------------------------
+ // Getters and setters properties
+ // -------------------------------------------------------------------------
+
+ @JsonProperty
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getJsonFilter()
+ {
+ return jsonFilter;
+ }
+
+ public void setJsonFilter( String jsonFilter )
+ {
+ this.jsonFilter = jsonFilter;
+ }
+
+ public Integer getSortOrder()
+ {
+ return sortOrder;
+ }
+
+ public void setSortOrder( Integer sortOrder )
+ {
+ this.sortOrder = sortOrder;
+ }
+}
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilterService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilterService.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilterService.java 2015-07-14 07:33:21 +0000
@@ -0,0 +1,57 @@
+package org.hisp.dhis.common.filter;
+
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.List;
+
+/**
+ * @author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>
+ */
+public interface MetaDataFilterService
+{
+ MetaDataFilter getFilter( Integer id );
+
+ MetaDataFilter getFilterByUid( String uid );
+
+ List<MetaDataFilter> getAllFilters();
+
+ List<MetaDataFilter> getFiltersBetweenByName( String name, int first, int max );
+
+ List<MetaDataFilter> getFiltersBetween( int first, int max );
+
+ void saveFilter( MetaDataFilter metaDataFilter );
+
+ void updateFilter( MetaDataFilter metaDataFilter );
+
+ void deleteFilter( MetaDataFilter metaDataFilter );
+
+ int getFilterCountByName( String name );
+
+ int getFilterCount();
+}
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons'
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilter.java 2015-05-28 18:23:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilter.java 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-package org.hisp.dhis.commons.filter;
-
-/*
- * Copyright (c) 2004-2015, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.hisp.dhis.common.BaseNameableObject;
-import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-
-/**
- * @author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>
- */
-@JacksonXmlRootElement( localName = "filter", namespace = DxfNamespaces.DXF_2_0 )
-public class MetaDataFilter
- extends BaseNameableObject
-{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = 8736213901318412954L;
-
- private String jsonFilter;
-
- private Integer sortOrder;
-
- //--------------------------------------------------------------------------
- // Constructors
- //--------------------------------------------------------------------------
-
- public MetaDataFilter()
- {
- }
-
- public MetaDataFilter( String name )
- {
- this.name = name;
- }
-
- public MetaDataFilter( String uid, String description, String name, String jsonFilter )
- {
- super( uid, description, name );
- this.jsonFilter = jsonFilter;
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters properties
- // -------------------------------------------------------------------------
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public String getJsonFilter()
- {
- return jsonFilter;
- }
-
- public void setJsonFilter( String jsonFilter )
- {
- this.jsonFilter = jsonFilter;
- }
-
- public Integer getSortOrder()
- {
- return sortOrder;
- }
-
- public void setSortOrder( Integer sortOrder )
- {
- this.sortOrder = sortOrder;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilterService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilterService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/commons/filter/MetaDataFilterService.java 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-package org.hisp.dhis.commons.filter;
-
-/*
- * Copyright (c) 2004-2015, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.List;
-
-/**
- * @author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>
- */
-public interface MetaDataFilterService
-{
- MetaDataFilter getFilter( Integer id );
-
- MetaDataFilter getFilterByUid( String uid );
-
- List<MetaDataFilter> getAllFilters();
-
- List<MetaDataFilter> getFiltersBetweenByName( String name, int first, int max );
-
- List<MetaDataFilter> getFiltersBetween( int first, int max );
-
- void saveFilter( MetaDataFilter metaDataFilter );
-
- void updateFilter( MetaDataFilter metaDataFilter );
-
- void deleteFilter( MetaDataFilter metaDataFilter );
-
- int getFilterCountByName( String name );
-
- int getFilterCount();
-}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MetaDataFilterSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MetaDataFilterSchemaDescriptor.java 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MetaDataFilterSchemaDescriptor.java 2015-07-14 07:33:21 +0000
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.hisp.dhis.security.Authority;
import org.hisp.dhis.security.AuthorityType;
import org.hisp.dhis.schema.Schema;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/commons/filter/DefaultMetaDataFilterService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/commons/filter/DefaultMetaDataFilterService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/commons/filter/DefaultMetaDataFilterService.java 2015-07-14 07:33:21 +0000
@@ -35,6 +35,8 @@
import java.util.List;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-07-14 07:33:21 +0000
@@ -85,7 +85,7 @@
</bean>
<bean id="org.hisp.dhis.filter.MetaDataFilterStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
- <property name="clazz" value="org.hisp.dhis.commons.filter.MetaDataFilter" />
+ <property name="clazz" value="org.hisp.dhis.common.filter.MetaDataFilter" />
<property name="sessionFactory" ref="sessionFactory" />
<property name="cacheable" value="true" />
</bean>
@@ -822,7 +822,7 @@
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
- <bean id="org.hisp.dhis.filter.MetaDataFilterService" class="org.hisp.dhis.commons.filter.DefaultMetaDataFilterService">
+ <bean id="org.hisp.dhis.commons.filter.MetaDataFilterService" class="org.hisp.dhis.commons.filter.DefaultMetaDataFilterService">
<property name="metaDataFilterStore" ref="org.hisp.dhis.filter.MetaDataFilterStore" />
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml 2015-07-14 07:33:21 +0000
@@ -5,7 +5,7 @@
[<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
>
<hibernate-mapping>
- <class name="org.hisp.dhis.commons.filter.MetaDataFilter" table="metadatafilter">
+ <class name="org.hisp.dhis.common.filter.MetaDataFilter" table="metadatafilter">
<cache usage="read-write" />
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java 2015-07-14 07:33:21 +0000
@@ -36,8 +36,8 @@
import org.hisp.dhis.security.acl.AclService;
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
-import org.hisp.dhis.commons.filter.MetaDataFilterService;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import org.hisp.dhis.dxf2.common.FilterOptions;
import org.hisp.dhis.dxf2.common.Options;
import org.hisp.dhis.scheduling.TaskId;
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java 2015-07-14 07:33:21 +0000
@@ -31,7 +31,7 @@
import net.sf.json.JSONObject;
import org.hisp.dhis.dxf2.common.FilterOptions;
import org.hisp.dhis.dxf2.common.Options;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.hisp.dhis.scheduling.TaskId;
import java.io.IOException;
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2015-07-14 07:33:21 +0000
@@ -57,7 +57,7 @@
import org.hisp.dhis.dxf2.events.event.Event;
import org.hisp.dhis.eventchart.EventChart;
import org.hisp.dhis.eventreport.EventReport;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorGroupSet;
=== 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 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2015-07-14 07:33:21 +0000
@@ -32,7 +32,7 @@
import org.hisp.dhis.attribute.AttributeValue;
import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
import org.hisp.dhis.chart.Chart;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.hisp.dhis.constant.Constant;
import org.hisp.dhis.dashboard.DashboardItem;
import org.hisp.dhis.dataapproval.DataApprovalLevel;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java 2015-06-19 10:09:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java 2015-07-14 07:33:21 +0000
@@ -31,7 +31,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import net.sf.json.JSONObject;
import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.hisp.dhis.dxf2.common.FilterOptions;
import org.hisp.dhis.dxf2.common.ImportOptions;
import org.hisp.dhis.dxf2.common.JacksonUtils;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataFilterController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataFilterController.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataFilterController.java 2015-07-14 07:33:21 +0000
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java 2015-07-14 07:33:21 +0000
@@ -29,7 +29,7 @@
*/
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilter;
/**
* @author Ovidiu Rosu <rosu.ovi@xxxxxxxxx>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java 2015-07-14 07:33:21 +0000
@@ -29,8 +29,8 @@
*/
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
-import org.hisp.dhis.commons.filter.MetaDataFilterService;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import org.hisp.dhis.paging.ActionPagingSupport;
import java.util.ArrayList;
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java 2015-07-14 07:33:21 +0000
@@ -29,8 +29,8 @@
*/
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
-import org.hisp.dhis.commons.filter.MetaDataFilterService;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import java.util.ArrayList;
import java.util.List;
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java 2015-07-14 07:33:21 +0000
@@ -29,8 +29,8 @@
*/
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.commons.filter.MetaDataFilter;
-import org.hisp.dhis.commons.filter.MetaDataFilterService;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import java.util.List;
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/ShowUpdateFilterExportFormAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/ShowUpdateFilterExportFormAction.java 2015-05-28 18:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/ShowUpdateFilterExportFormAction.java 2015-07-14 07:33:21 +0000
@@ -28,8 +28,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.commons.filter.MetaDataFilter;
-import org.hisp.dhis.commons.filter.MetaDataFilterService;
+import org.hisp.dhis.common.filter.MetaDataFilter;
+import org.hisp.dhis.common.filter.MetaDataFilterService;
import com.opensymphony.xwork2.Action;
