diff --git a/pom.xml b/pom.xml index 2a112b6..459c3e9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,265 +1,279 @@ - + - - 4.0.0 + + 4.0.0 - it.geosolutions - geoserver-manager - 1.4.1-SNAPSHOT + it.geosolutions + geoserver-manager + 1.4.1-SNAPSHOT - jar + jar - GeoServer 2 Manager - REST based - + GeoServer 2 Manager - REST based + GeoServer Manager is a library to interact with GeoServer 2.x. The scope of this library is to have a simple API, and use as few external libs as possible. - 2007 + 2007 - - GeoSolutions - http://www.geo-solutions.it - + + GeoSolutions + http://www.geo-solutions.it + - - - etj - Emanuele Tajariol - etj AT geosolutions.it - GeoSolutions - http://www.geo-solutions.it - - architect - developer - - +1 - - - ccancellieri - Carlo Cancellieri - carlo.cancellieri AT geosolutions.it - GeoSolutions - http://www.geo-solutions.it - - architect - developer - - +1 - - - - - - MIT License - http://opensource.org/licenses/mit-license.php - repo - - - - http://code.google.com/p/geoserver-manager/ - - - googlecode - http://code.google.com/p/geoserver-manager/issues/list - - - - - GeoServer Manager User List - geoserver-manager-users@googlegroups.com - http://groups.google.com/group/geoserver-manager-users/topics - - + + + etj + Emanuele Tajariol + etj AT geosolutions.it + GeoSolutions + http://www.geo-solutions.it + + architect + developer + + +1 + + + ccancellieri + Carlo Cancellieri + carlo.cancellieri AT geosolutions.it + GeoSolutions + http://www.geo-solutions.it + + architect + developer + + +1 + + - - scm:git:[fetch=]https://github.com/geosolutions-it/geoserver-manager.git[push=]git@github.com:geosolutions-it/geoserver-manager.git - - - https://github.com/geosolutions-it/geoserver-manager - + + + MIT License + http://opensource.org/licenses/mit-license.php + repo + + - - jenkins - http://ci.geo-solutions.it/ - - - - http://maven.geo-solutions.it - - false - geosolutions - ftp://maven.geo-solutions.it/ - - - demo.geosolutions - scp://demo.geo-solutions.it/var/www/share/javadoc/gsman - - + http://code.google.com/p/geoserver-manager/ + + + googlecode + http://code.google.com/p/geoserver-manager/issues/list + + + + + GeoServer Manager User List + geoserver-manager-users@googlegroups.com + http://groups.google.com/group/geoserver-manager-users/topics + + + + + scm:git:[fetch=]https://github.com/geosolutions-it/geoserver-manager.git[push=]git@github.com:geosolutions-it/geoserver-manager.git + + + https://github.com/geosolutions-it/geoserver-manager + + + + jenkins + http://ci.geo-solutions.it/ + + + + http://maven.geo-solutions.it + + false + geosolutions + ftp://maven.geo-solutions.it/ + + + demo.geosolutions + scp://demo.geo-solutions.it/var/www/share/javadoc/gsman + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + + + - - - - - true - org.apache.maven.plugins - maven-source-plugin - - true - - - - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - v@{project.version} - - - + + + + + true + org.apache.maven.plugins + maven-source-plugin + + true + + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.2.2 + + v@{project.version} + + + - - - - - - - - - org.apache.maven.wagon - wagon-ftp - 1.0-beta-7 - - - + + + + + + + + + org.apache.maven.wagon + wagon-ftp + 1.0-beta-7 + + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://commons.apache.org/lang/api - http://java.sun.com/j2se/1.5.0/docs/api - http://www.jdom.org/docs/apidocs - - - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + http://commons.apache.org/lang/api + http://java.sun.com/j2se/1.5.0/docs/api + http://www.jdom.org/docs/apidocs + + + - + + + - - commons-io - commons-io - 2.0.1 - + + 1.5.11 + - - commons-httpclient - commons-httpclient - 3.1 - - - - org.jdom - jdom - 1.1 - + - - log4j - log4j - 1.2.16 - + + commons-io + commons-io + 2.0.1 + - - - + + commons-httpclient + commons-httpclient + 3.1 + + + commons-logging + commons-logging + + + - - junit - junit - 4.8.2 - test - + + org.jdom + jdom + 1.1 + - - org.springframework - spring-core - 2.5.6.SEC02 - test - - + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + + + + + + + junit + junit + 4.8.2 + test + + + + org.springframework + spring-core + 2.5.6.SEC02 + test + + diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java index b1cfc11..35bc2f2 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java +++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java @@ -45,8 +45,8 @@ import java.util.Iterator; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.io.FilenameUtils; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Connect to a GeoServer instance to publish or modify data. @@ -58,8 +58,7 @@ import org.apache.log4j.Logger; */ public class GeoServerRESTPublisher { - private static final Logger LOGGER = Logger - .getLogger(GeoServerRESTPublisher.class); + private static final Logger LOGGER = LoggerFactory.getLogger(GeoServerRESTPublisher.class); private final String restURL; private final String gsuser; private final String gspass; @@ -137,7 +136,7 @@ public class GeoServerRESTPublisher { try { return publishStyle(sldBody, null); } catch (IllegalArgumentException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) { + if (LOGGER.isErrorEnabled()) { LOGGER.error(e.getLocalizedMessage(), e); } } @@ -340,7 +339,7 @@ public class GeoServerRESTPublisher { try { return removeStyle(styleName, true); } catch (IllegalArgumentException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) { + if (LOGGER.isErrorEnabled()) { LOGGER.error(e.getLocalizedMessage(), e); } } @@ -427,7 +426,7 @@ public class GeoServerRESTPublisher { LOGGER.info("Store successfully created using ( " + uri + " )"); return true; } else { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Error in creating store using: " + uri); return false; } @@ -761,7 +760,7 @@ public class GeoServerRESTPublisher { final String layername = fte.getName(); if (layername == null || layername.isEmpty()) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("GSFeatureTypeEncoder has no valid name associated, try using GSFeatureTypeEncoder.setName(String)"); return false; } @@ -778,7 +777,7 @@ public class GeoServerRESTPublisher { LOGGER.info("DB layer successfully added (layer:" + layername + ")"); if (layerEncoder == null) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("GSLayerEncoder is null: Unable to find the defauldStyle for this layer"); return false; } @@ -1209,7 +1208,7 @@ public class GeoServerRESTPublisher { // create Coverage Store if (!createCoverage(workspace, storeName, coverageEncoder)) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Unable to create a coverage for the store:" + coverageName); return null; @@ -1223,7 +1222,7 @@ public class GeoServerRESTPublisher { this.gspass); return reader.getCoverageStore(workspace, storeName); } catch (MalformedURLException e) { - LOGGER.log(Level.ERROR, e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } return null; @@ -1343,7 +1342,7 @@ public class GeoServerRESTPublisher { * readable by target GeoServer not the calling client! */ if (!mosaicDir.isDirectory()) { - if (LOGGER.isEnabledFor(Level.WARN)) + if (LOGGER.isWarnEnabled()) LOGGER.warn("Directory '" + mosaicDir + "' not exists locally. Continue: please check existance on the remote server."); @@ -1465,13 +1464,13 @@ public class GeoServerRESTPublisher { return false; } if (!createCoverage(workspace, storeName, coverageEncoder)) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Unable to create a coverage for the store:" + coverageName); return false; } if (!configureLayer(workspace, coverageName, layerEncoder)) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Unable to configure the Layer for the coverage:" + coverageName); return false; @@ -1508,7 +1507,7 @@ public class GeoServerRESTPublisher { fqLayerName = layerName; - if (LOGGER.isEnabledFor(Level.WARN)) { + if (LOGGER.isWarnEnabled()) { LOGGER.warn("Null workspace while configuring layer : " + layerName + " -- This behavior is deprecated."); } @@ -1551,8 +1550,8 @@ public class GeoServerRESTPublisher { // the covstore is still there: should we delete it? } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1580,7 +1579,7 @@ public class GeoServerRESTPublisher { fqLayerName = layerName; - if (LOGGER.isEnabledFor(Level.WARN)) { + if (LOGGER.isWarnEnabled()) { LOGGER.warn("Null workspace while configuring layer : " + layerName + " -- This behavior is deprecated."); } @@ -1615,8 +1614,8 @@ public class GeoServerRESTPublisher { // the store is still there: should we delete it? } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1637,7 +1636,7 @@ public class GeoServerRESTPublisher { try { return removeDatastore(workspace, storename, true); } catch (IllegalArgumentException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Arguments may not be null or empty!", e); } return false; @@ -1684,8 +1683,8 @@ public class GeoServerRESTPublisher { return deleted; } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1704,7 +1703,7 @@ public class GeoServerRESTPublisher { try { return removeCoverageStore(workspace, storename, true); } catch (IllegalArgumentException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Arguments may not be null or empty!", e); } return false; @@ -1750,8 +1749,8 @@ public class GeoServerRESTPublisher { return deleted; } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1769,7 +1768,7 @@ public class GeoServerRESTPublisher { try { return removeWorkspace(workspace, false); } catch (IllegalArgumentException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Arguments may not be null or empty!", e); } return false; @@ -1813,8 +1812,8 @@ public class GeoServerRESTPublisher { return deleted; } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1853,7 +1852,7 @@ public class GeoServerRESTPublisher { boolean deleted = HTTPUtils.delete(deleteUrl.toExternalForm(), gsuser, gspass); if (!deleted) { - if (LOGGER.isEnabledFor(Level.WARN)) + if (LOGGER.isWarnEnabled()) LOGGER.warn("Could not delete layergroup " + name); } else { if (LOGGER.isInfoEnabled()) @@ -1862,8 +1861,8 @@ public class GeoServerRESTPublisher { return deleted; } catch (MalformedURLException ex) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(ex); + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(),ex); return false; } } @@ -1889,7 +1888,7 @@ public class GeoServerRESTPublisher { fqLayerName = layerName; - if (LOGGER.isEnabledFor(Level.WARN)) { + if (LOGGER.isWarnEnabled()) { LOGGER.warn("Null workspace while removing layer : " + layerName + " -- This behavior is deprecated."); } @@ -1897,7 +1896,7 @@ public class GeoServerRESTPublisher { fqLayerName = workspace + ":" + layerName; } if (layerName == null) { - if (LOGGER.isEnabledFor(Level.ERROR)) { + if (LOGGER.isErrorEnabled()) { LOGGER.error("Null layerName : " + layerName); } return false; @@ -1911,7 +1910,7 @@ public class GeoServerRESTPublisher { LOGGER.info("Layer successfully removed: " + fqLayerName); } } else { - if (LOGGER.isEnabledFor(Level.WARN)) + if (LOGGER.isWarnEnabled()) LOGGER.warn("Error removing layer " + fqLayerName); } @@ -1956,7 +1955,7 @@ public class GeoServerRESTPublisher { LOGGER.info("Layer successfully configured: " + fqLayerName); } } else { - if (LOGGER.isEnabledFor(Level.WARN)) + if (LOGGER.isWarnEnabled()) LOGGER.warn("Error configuring layer " + fqLayerName + " (" + sendResult + ")"); } @@ -1980,7 +1979,7 @@ public class GeoServerRESTPublisher { final String wsname, final String csname) { final String cname = ce.getName(); if (cname == null) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Unable to configure a coverage with no name try using GSCoverageEncoder.setName(String)"); return false; } @@ -1989,13 +1988,13 @@ public class GeoServerRESTPublisher { try { reader = new GeoServerRESTReader(restURL, gsuser, gspass); } catch (MalformedURLException e) { - if (LOGGER.isEnabledFor(Level.ERROR)) - LOGGER.error(e); + if (LOGGER.isErrorEnabled()) + LOGGER.error(e.getLocalizedMessage(),e); return false; } final RESTCoverageList covList = reader.getCoverages(wsname, csname); if (covList.isEmpty()) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("No coverages found in new coveragestore " + csname); return false; @@ -2011,7 +2010,7 @@ public class GeoServerRESTPublisher { } // if no coverage to configure is found return false if (!found) { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("No coverages found in new coveragestore " + csname + " called " + cname); return false; @@ -2030,7 +2029,7 @@ public class GeoServerRESTPublisher { + csname + ":" + cname); } } else { - if (LOGGER.isEnabledFor(Level.WARN)) + if (LOGGER.isWarnEnabled()) LOGGER.warn("Error configuring coverage " + wsname + ":" + csname + ":" + cname + " (" + sendResult + ")"); } @@ -2125,7 +2124,7 @@ public class GeoServerRESTPublisher { + ":" + storeName + ":" + resourceName); } } else { - if (LOGGER.isEnabledFor(Level.ERROR)) + if (LOGGER.isErrorEnabled()) LOGGER.error("Error creating coverage " + workspace + ":" + storeName + ":" + resourceName + " (" + sendResult + ")"); diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java index bf83b7e..792a54a 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java +++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java @@ -29,8 +29,8 @@ import it.geosolutions.geoserver.rest.decoder.RESTCoverage; import it.geosolutions.geoserver.rest.decoder.RESTCoverageList; import it.geosolutions.geoserver.rest.decoder.RESTCoverageStore; import it.geosolutions.geoserver.rest.decoder.RESTCoverageStoreList; -import it.geosolutions.geoserver.rest.decoder.RESTDataStoreList; import it.geosolutions.geoserver.rest.decoder.RESTDataStore; +import it.geosolutions.geoserver.rest.decoder.RESTDataStoreList; import it.geosolutions.geoserver.rest.decoder.RESTFeatureType; import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.decoder.RESTLayerGroup; @@ -46,7 +46,10 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + /** @@ -58,7 +61,7 @@ import org.apache.log4j.Logger; */ public class GeoServerRESTReader { - private final static Logger LOGGER = Logger.getLogger(GeoServerRESTReader.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoServerRESTReader.class); private final String baseurl; private String username; private String password; diff --git a/src/main/java/it/geosolutions/geoserver/rest/HTTPUtils.java b/src/main/java/it/geosolutions/geoserver/rest/HTTPUtils.java index bb40204..143418a 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/HTTPUtils.java +++ b/src/main/java/it/geosolutions/geoserver/rest/HTTPUtils.java @@ -33,6 +33,7 @@ import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; + import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; @@ -47,13 +48,14 @@ import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Low level HTTP utilities. */ class HTTPUtils { - private static final Logger LOGGER = Logger.getLogger(HTTPUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HTTPUtils.class); /** * Performs an HTTP GET on the given URL. diff --git a/src/main/java/it/geosolutions/geoserver/rest/decoder/utils/JDOMBuilder.java b/src/main/java/it/geosolutions/geoserver/rest/decoder/utils/JDOMBuilder.java index e3efb62..71fdf7b 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/decoder/utils/JDOMBuilder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/decoder/utils/JDOMBuilder.java @@ -27,11 +27,13 @@ package it.geosolutions.geoserver.rest.decoder.utils; import java.io.IOException; import java.io.StringReader; -import org.apache.log4j.Logger; + import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -39,7 +41,7 @@ import org.jdom.input.SAXBuilder; */ public class JDOMBuilder { - private final static Logger LOGGER = Logger.getLogger(JDOMBuilder.class); + private final static Logger LOGGER = LoggerFactory.getLogger(JDOMBuilder.class); public static Element buildElement(String response) { if(response == null) diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtils.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtils.java index 35c6fc6..5528879 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtils.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtils.java @@ -29,9 +29,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.log4j.Logger; import org.jdom.Element; import org.jdom.filter.Filter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -42,7 +43,7 @@ public abstract class ElementUtils { /** * Default logger */ - private final static Logger LOGGER = Logger.getLogger(ElementUtils.class); + private final static Logger LOGGER = LoggerFactory.getLogger(ElementUtils.class); /** * diff --git a/src/test/java/it/geosolutions/geoserver/rest/ConfigTest.java b/src/test/java/it/geosolutions/geoserver/rest/ConfigTest.java index 8138159..a1c96a1 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/ConfigTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/ConfigTest.java @@ -35,7 +35,8 @@ import java.io.IOException; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.filefilter.SuffixFileFilter; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -48,7 +49,7 @@ import org.springframework.core.io.ClassPathResource; * @author etj */ public class ConfigTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(ConfigTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(ConfigTest.class); private static final String DEFAULT_WS = "geosolutions"; diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java index e90f9a3..82b9b7c 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java @@ -25,19 +25,22 @@ package it.geosolutions.geoserver.rest; -import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem; import it.geosolutions.geoserver.rest.decoder.RESTCoverage; import it.geosolutions.geoserver.rest.decoder.RESTCoverageStore; import it.geosolutions.geoserver.rest.decoder.RESTDataStore; import it.geosolutions.geoserver.rest.decoder.RESTFeatureType; import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.decoder.RESTLayerGroup; +import it.geosolutions.geoserver.rest.decoder.utils.NameLinkElem; + import java.net.MalformedURLException; import java.net.URL; import java.util.List; import junit.framework.TestCase; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Initializes REST params. @@ -54,7 +57,7 @@ import org.apache.log4j.Logger; * @author etj */ public abstract class GeoserverRESTTest extends TestCase { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTTest.class); protected static final String DEFAULT_WS = "geosolutions"; diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSWorkspaceEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSWorkspaceEncoderTest.java index ada117e..3fbb068 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/GSWorkspaceEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/GSWorkspaceEncoderTest.java @@ -21,11 +21,12 @@ package it.geosolutions.geoserver.rest.encoder; import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** - * + * * @author Carlo Cancellieri - carlo.cancellieri@geo-solutions.it */ public class GSWorkspaceEncoderTest extends TestCase { @@ -36,18 +37,17 @@ public class GSWorkspaceEncoderTest extends TestCase { /** * Default logger */ - protected final static Logger LOGGER = Logger.getLogger(GSWorkspaceEncoderTest.class); - + protected final static Logger LOGGER = LoggerFactory.getLogger(GSWorkspaceEncoderTest.class); + @Test public void testAll() { - final GSWorkspaceEncoder wsenc = new GSWorkspaceEncoder("WS1"); - LOGGER.info(wsenc.toString()); - - wsenc.setName("test_name"); - LOGGER.info(wsenc.toString()); - wsenc.setName("new_name"); - LOGGER.info(wsenc.toString()); - - + final GSWorkspaceEncoder wsenc = new GSWorkspaceEncoder("WS1"); + LOGGER.info(wsenc.toString()); + + wsenc.setName("test_name"); + LOGGER.info(wsenc.toString()); + wsenc.setName("new_name"); + LOGGER.info(wsenc.toString()); + } } diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java index a313149..d25fbe9 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoderTest.java @@ -26,10 +26,11 @@ import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder.Pr import it.geosolutions.geoserver.rest.encoder.utils.ElementUtils; import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.jdom.Element; import org.junit.Assert; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -43,7 +44,7 @@ public class GSCoverageEncoderTest extends TestCase { /** * Default logger */ - protected final static Logger LOGGER = Logger.getLogger(GSCoverageEncoderTest.class); + protected final static Logger LOGGER = LoggerFactory.getLogger(GSCoverageEncoderTest.class); /** * test set or reset of reprojection diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSImageMosaicEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSImageMosaicEncoderTest.java index d028168..86b3801 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSImageMosaicEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/coverage/GSImageMosaicEncoderTest.java @@ -21,8 +21,9 @@ package it.geosolutions.geoserver.rest.encoder.coverage; import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -36,7 +37,7 @@ public class GSImageMosaicEncoderTest extends TestCase { /** * Default logger */ - protected final static Logger LOGGER = Logger.getLogger(GSImageMosaicEncoderTest.class); + protected final static Logger LOGGER = LoggerFactory.getLogger(GSImageMosaicEncoderTest.class); /** * TODO implement this test diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java index d325cdf..29ce77e 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureEncoderTest.java @@ -30,10 +30,11 @@ import java.math.BigDecimal; import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.jdom.Element; import org.junit.Assert; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -41,7 +42,7 @@ import org.junit.Test; * @author Carlo Cancellieri - carlo.cancellieri@geo-solutions.it */ public class GSFeatureEncoderTest extends TestCase { - protected final static Logger LOGGER = Logger.getLogger(GSFeatureEncoderTest.class); + protected final static Logger LOGGER = LoggerFactory.getLogger(GSFeatureEncoderTest.class); public GSFeatureEncoderTest() { } diff --git a/src/test/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtilsTest.java b/src/test/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtilsTest.java index ec5b40b..e037deb 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtilsTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/encoder/utils/ElementUtilsTest.java @@ -1,21 +1,17 @@ package it.geosolutions.geoserver.rest.encoder.utils; -import it.geosolutions.geoserver.rest.encoder.GSWorkspaceEncoderTest; - -import java.io.IOException; import java.util.Iterator; import java.util.List; -import org.apache.log4j.Logger; -import org.jdom.Content; import org.jdom.Element; import org.jdom.filter.Filter; -import org.jdom.output.XMLOutputter; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ElementUtilsTest { @@ -23,7 +19,7 @@ public class ElementUtilsTest { /** * Default logger */ - protected final static Logger LOGGER = Logger.getLogger(ElementUtilsTest.class); + protected final static Logger LOGGER = LoggerFactory.getLogger(ElementUtilsTest.class); final static String NAME="TEST"; diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTGeoTiffTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTGeoTiffTest.java index a44ef90..8fe664c 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTGeoTiffTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTGeoTiffTest.java @@ -27,15 +27,14 @@ package it.geosolutions.geoserver.rest.publisher; import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTCoverageStore; -import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; -import it.geosolutions.geoserver.rest.encoder.coverage.GSCoverageEncoder; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -47,7 +46,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTGeoTiffTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTGeoTiffTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTGeoTiffTest.class); public GeoserverRESTGeoTiffTest(String testName) { super(testName); @@ -72,7 +71,7 @@ public class GeoserverRESTGeoTiffTest extends GeoserverRESTTest { boolean pc = publisher.publishExternalGeoTIFF(DEFAULT_WS, storeName, geotiff, layerName,"EPSG:4326",ProjectionPolicy.FORCE_DECLARED,"raster"); assertTrue("publish() failed", pc); assertTrue(existsLayer(layerName)); - LOGGER.info(pc); + LOGGER.info("Published "+pc); RESTCoverageStore reloadedCS = reader.getCoverageStore(DEFAULT_WS, storeName); assertEquals(storeName, reloadedCS.getName()); diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTImageMosaicTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTImageMosaicTest.java index 9200038..d2137e3 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTImageMosaicTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTImageMosaicTest.java @@ -26,8 +26,8 @@ package it.geosolutions.geoserver.rest.publisher; -import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.ParameterConfigure; +import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTCoverageStore; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; @@ -40,7 +40,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.apache.commons.httpclient.NameValuePair; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -68,7 +69,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTImageMosaicTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTImageMosaicTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTImageMosaicTest.class); public GeoserverRESTImageMosaicTest(String testName) { diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPostgisDatastoreTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPostgisDatastoreTest.java index 8f61849..2d76af5 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPostgisDatastoreTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPostgisDatastoreTest.java @@ -29,7 +29,9 @@ package it.geosolutions.geoserver.rest.publisher; import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTDataStore; import it.geosolutions.geoserver.rest.encoder.GSPostGISDatastoreEncoder; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Testcase for creating postgis-based resources on geoserver. @@ -57,7 +59,7 @@ import org.apache.log4j.Logger; */ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTPostgisDatastoreTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTPostgisDatastoreTest.class); private static final String DEFAULT_WS = "it.geosolutions"; private final boolean pgIgnore; diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublisherTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublisherTest.java index 7a19fd2..4ca9a21 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublisherTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublisherTest.java @@ -31,7 +31,9 @@ import it.geosolutions.geoserver.rest.decoder.RESTLayer; import java.io.FileNotFoundException; import java.io.IOException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Testcase for publishing layers on geoserver. @@ -43,7 +45,7 @@ import org.apache.log4j.Logger; */ public class GeoserverRESTPublisherTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTPublisherTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTPublisherTest.class); public GeoserverRESTPublisherTest(String testName) { super(testName); diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTShapeTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTShapeTest.java index a8cc71e..8859d92 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTShapeTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTShapeTest.java @@ -25,8 +25,8 @@ package it.geosolutions.geoserver.rest.publisher; -import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.UploadMethod; +import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; @@ -35,7 +35,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.apache.commons.httpclient.NameValuePair; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -48,7 +49,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTShapeTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTShapeTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTShapeTest.class); public GeoserverRESTShapeTest(String testName) { super(testName); diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java index d4ffd6c..11eea6f 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTStyleTest.java @@ -36,9 +36,10 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; import org.jdom.Element; import org.jdom.Namespace; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -51,7 +52,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTStyleTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger + private final static Logger LOGGER = LoggerFactory .getLogger(GeoserverRESTStyleTest.class); public GeoserverRESTStyleTest(String testName) { diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java index dfc109e..6730ea4 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorkspaceTest.java @@ -26,15 +26,13 @@ package it.geosolutions.geoserver.rest.publisher; import it.geosolutions.geoserver.rest.GeoserverRESTTest; -import it.geosolutions.geoserver.rest.decoder.RESTCoverageStore; -import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder.ProjectionPolicy; -import it.geosolutions.geoserver.rest.encoder.coverage.GSCoverageEncoder; import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -47,7 +45,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTWorkspaceTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTWorkspaceTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTWorkspaceTest.class); public GeoserverRESTWorkspaceTest(String testName) { super(testName); diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java index d4ce426..f67aaee 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTWorldImageTest.java @@ -25,14 +25,15 @@ package it.geosolutions.geoserver.rest.publisher; -import it.geosolutions.geoserver.rest.GeoserverRESTTest; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.ParameterConfigure; +import it.geosolutions.geoserver.rest.GeoserverRESTTest; import java.io.File; import java.io.IOException; import org.apache.commons.httpclient.NameValuePair; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; /** @@ -44,7 +45,7 @@ import org.springframework.core.io.ClassPathResource; */ public class GeoserverRESTWorldImageTest extends GeoserverRESTTest { - private final static Logger LOGGER = Logger.getLogger(GeoserverRESTWorldImageTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(GeoserverRESTWorldImageTest.class); public GeoserverRESTWorldImageTest(String testName) { super(testName);