# HG changeset patch # User Sascha L. Teichmann # Date 1300205619 0 # Node ID dec4257ad57083e2750045db1f930cf849bef4e3 # Parent 2d393d79c0975a78fa6a36b7f7787cfce37b998f Changed imports to fit new positions of XMLUtils and Config gnv-artifacts/trunk@1478 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/ChangeLog Tue Mar 15 16:13:39 2011 +0000 @@ -1,3 +1,10 @@ +2011-03-14 Sascha L. Teichmann + + * src/**/*.java: Changed imports to fit new positions of XMLUtils and Config: + $ find -name \*.java | xargs sed -i \ + -e 's/import de\.intevation\.artifactdatabase\.Config/import de.intevation.artifacts.common.utils.Config/' \ + -e 's/import de\.intevation\.artifactdatabase\.XMLUtils/import de.intevation.artifacts.common.utils.XMLUtils/' + 2010-11-04 Sascha L. Teichmann * contrib/palette2polygonVM.xsl, diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,9 +8,9 @@ package de.intevation.gnv.artifacts; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.Artifact; import de.intevation.artifacts.ArtifactDatabase; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVDefaultArtifact.java Tue Mar 15 16:13:39 2011 +0000 @@ -9,7 +9,7 @@ package de.intevation.gnv.artifacts; import de.intevation.artifactdatabase.DefaultArtifact; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Tue Mar 15 16:13:39 2011 +0000 @@ -22,7 +22,7 @@ import de.intevation.artifactdatabase.DefaultArtifactFactory; import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.Artifact; import de.intevation.artifacts.ArtifactFactory; import de.intevation.gnv.artifacts.fis.SelectProductArtifact; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,8 +8,8 @@ package de.intevation.gnv.artifacts.context; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactContextFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Tue Mar 15 16:13:39 2011 +0000 @@ -24,7 +24,7 @@ import org.w3c.dom.NodeList; import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.Artifact; import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.ArtifactNamespaceContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Tue Mar 15 16:13:39 2011 +0000 @@ -25,7 +25,7 @@ import com.vividsolutions.jts.io.WKTReader; import de.intevation.artifactdatabase.DefaultService; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallMeta; import de.intevation.artifacts.ServiceFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.chart; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import java.awt.Color; import java.awt.Font; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Tue Mar 15 16:13:39 2011 +0000 @@ -19,7 +19,7 @@ import de.intevation.artifacts.CallContext; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.gnv.chart.Chart; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Tue Mar 15 16:13:39 2011 +0000 @@ -21,7 +21,7 @@ import com.vividsolutions.jts.geom.Point; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.state.describedata.DefaultKeyValueDescribeData; import de.intevation.gnv.state.describedata.KeyValueDescibeData; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.state; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Tue Mar 15 16:13:39 2011 +0000 @@ -21,7 +21,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; import de.intevation.gnv.artifacts.ressource.RessourceFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Tue Mar 15 16:13:39 2011 +0000 @@ -26,8 +26,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; import de.intevation.gnv.artifacts.cache.CacheFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.state; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.artifacts.CallContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.state; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.artifacts.CallContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Tue Mar 15 16:13:39 2011 +0000 @@ -34,8 +34,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/SwitchModeState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/SwitchModeState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/SwitchModeState.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.state; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java Tue Mar 15 16:13:39 2011 +0000 @@ -23,7 +23,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.gnv.artifacts.cache.CacheFactory; import de.intevation.gnv.geobackend.base.query.cache.CacheCleaner; import de.intevation.gnv.geobackend.base.query.container.QueryContainerFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Tue Mar 15 16:13:39 2011 +0000 @@ -24,8 +24,8 @@ import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.WKTReader; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.gnv.artifacts.context.GNVArtifactContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Tue Mar 15 16:13:39 2011 +0000 @@ -12,7 +12,7 @@ import com.vividsolutions.jts.geom.Coordinate; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.artifacts.CallContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Tue Mar 15 16:13:39 2011 +0000 @@ -30,8 +30,8 @@ import com.vividsolutions.jts.geom.MultiPolygon; import com.vividsolutions.jts.geom.Polygon; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.gnv.artifacts.cache.CacheFactory; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Tue Mar 15 16:13:39 2011 +0000 @@ -34,8 +34,8 @@ import org.w3c.dom.NodeList; import au.com.bytecode.opencsv.CSVWriter; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Tue Mar 15 16:13:39 2011 +0000 @@ -13,7 +13,7 @@ import org.apache.log4j.Logger; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.gnv.state.InputData; import de.intevation.gnv.state.State; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.transition; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import org.w3c.dom.Node; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Tue Mar 15 16:13:39 2011 +0000 @@ -13,7 +13,7 @@ import org.apache.log4j.Logger; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.gnv.state.InputData; import de.intevation.gnv.state.State; import de.intevation.gnv.state.exception.StateException; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,8 +8,8 @@ package de.intevation.gnv.utils; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.Config; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Tue Mar 15 16:13:39 2011 +0000 @@ -25,7 +25,7 @@ import com.vividsolutions.jts.geom.Envelope; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.gnv.artifacts.context.GNVArtifactContext; diff -r 2d393d79c097 -r dec4257ad570 gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java --- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Thu Nov 04 21:46:58 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Tue Mar 15 16:13:39 2011 +0000 @@ -8,7 +8,7 @@ package de.intevation.gnv.artifacts; -import de.intevation.artifactdatabase.Config; +import de.intevation.artifacts.common.utils.Config; import de.intevation.artifactdatabase.DefaultCallMeta; import de.intevation.artifactdatabase.DefaultPreferredLocale; import de.intevation.artifactdatabase.FactoryBootstrap;