From 85747f3a94a4610d94270984a5ad8e80c582cbca Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Sat, 14 May 2022 12:15:00 +0200 Subject: [PATCH 1/5] #1326 - removed package-info.java --- .../r3d/opengl/display/package-info.java | 40 ----------------- .../r3d/opengl/rendering/package-info.java | 40 ----------------- .../r3d/opengl/tesselation/package-info.java | 40 ----------------- .../deegree/rendering/r3d/package-info.java | 40 ----------------- .../org/deegree/feature/package-info.java | 40 ----------------- .../java/org/deegree/filter/package-info.java | 40 ----------------- .../java/org/deegree/gml/package-info.java | 40 ----------------- .../org/deegree/commons/package-info.java | 40 ----------------- .../org/deegree/coverage/package-info.java | 40 ----------------- .../cs/configuration/package-info.java | 40 ----------------- .../java/org/deegree/cs/package-info.java | 45 ------------------- .../deegree/cs/projections/package-info.java | 40 ----------------- .../cs/transformations/package-info.java | 40 ----------------- .../org/deegree/geometry/package-info.java | 40 ----------------- .../org/deegree/rendering/package-info.java | 40 ----------------- .../deegree/rendering/r2d/package-info.java | 40 ----------------- .../java/org/deegree/style/package-info.java | 40 ----------------- .../deegree/services/wms/package-info.java | 40 ----------------- 18 files changed, 725 deletions(-) delete mode 100644 deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/display/package-info.java delete mode 100644 deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/package-info.java delete mode 100644 deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/tesselation/package-info.java delete mode 100644 deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/package-info.java delete mode 100644 deegree-core/deegree-core-base/src/main/java/org/deegree/feature/package-info.java delete mode 100644 deegree-core/deegree-core-base/src/main/java/org/deegree/filter/package-info.java delete mode 100644 deegree-core/deegree-core-base/src/main/java/org/deegree/gml/package-info.java delete mode 100644 deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/package-info.java delete mode 100644 deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/package-info.java delete mode 100644 deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/package-info.java delete mode 100644 deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/package-info.java delete mode 100644 deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/package-info.java delete mode 100644 deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/package-info.java delete mode 100644 deegree-core/deegree-core-geometry/src/main/java/org/deegree/geometry/package-info.java delete mode 100644 deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/package-info.java delete mode 100644 deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/package-info.java delete mode 100644 deegree-core/deegree-core-style/src/main/java/org/deegree/style/package-info.java delete mode 100644 deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/package-info.java diff --git a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/display/package-info.java b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/display/package-info.java deleted file mode 100644 index 11a9f5cffa..0000000000 --- a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/display/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(debug = "rendering of the interactive components") -package org.deegree.rendering.r3d.opengl.display; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/package-info.java b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/package-info.java deleted file mode 100644 index 65dc778ec1..0000000000 --- a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(debug = "log rendering status information") -package org.deegree.rendering.r3d.opengl.rendering; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/tesselation/package-info.java b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/tesselation/package-info.java deleted file mode 100644 index c536a7172b..0000000000 --- a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/tesselation/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(debug = "log tesselation status information") -package org.deegree.rendering.r3d.opengl.tesselation; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/package-info.java b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/package-info.java deleted file mode 100644 index fe6726ccfa..0000000000 --- a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "3D rendering") -package org.deegree.rendering.r3d; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-base/src/main/java/org/deegree/feature/package-info.java b/deegree-core/deegree-core-base/src/main/java/org/deegree/feature/package-info.java deleted file mode 100644 index 3c22231825..0000000000 --- a/deegree-core/deegree-core-base/src/main/java/org/deegree/feature/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "feature subsystem", debug = "placeholder to enable quick debugging, please describe further") -package org.deegree.feature; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-base/src/main/java/org/deegree/filter/package-info.java b/deegree-core/deegree-core-base/src/main/java/org/deegree/filter/package-info.java deleted file mode 100644 index 8f4f806a2b..0000000000 --- a/deegree-core/deegree-core-base/src/main/java/org/deegree/filter/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "filter subsystem", debug = "placeholder to enable quick debugging, please describe further") -package org.deegree.filter; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-base/src/main/java/org/deegree/gml/package-info.java b/deegree-core/deegree-core-base/src/main/java/org/deegree/gml/package-info.java deleted file mode 100644 index 1771ac9cd1..0000000000 --- a/deegree-core/deegree-core-base/src/main/java/org/deegree/gml/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "GML subsystem", debug = "placeholder to enable quick debugging, please describe further") -package org.deegree.gml; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/package-info.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/package-info.java deleted file mode 100644 index ed71fadaf9..0000000000 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "common logging settings for all of deegree") -package org.deegree.commons; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/package-info.java b/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/package-info.java deleted file mode 100644 index 6df837a69a..0000000000 --- a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "coverage subsystem") -package org.deegree.coverage; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/package-info.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/package-info.java deleted file mode 100644 index 5069924eba..0000000000 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "crs configuration logging", debug = "Output logging information on loading of Coordinate Systems from a configuration.") -package org.deegree.cs.configuration; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/package-info.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/package-info.java deleted file mode 100644 index e065f57027..0000000000 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/package-info.java +++ /dev/null @@ -1,45 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "crs subsystem") -/** - * The org.deegree.cs package contains all necessities to transform and project coordinates form one coordinates system - * into another. For easy access to all information (e.g. identifier, name, description etc. ) about a crs, transformation - * or projection, the CRSIdentifiable class is used as super class. - */ -package org.deegree.cs; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/package-info.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/package-info.java deleted file mode 100644 index 6f9ee474b5..0000000000 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "projections logging", debug = "Get logging information about projections and the execution of projections.") -package org.deegree.cs.projections; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/package-info.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/package-info.java deleted file mode 100644 index c8b12f6502..0000000000 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "Transformation logging", debug = "Get information about transformations and the creation of transformation chains.") -package org.deegree.cs.transformations; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-geometry/src/main/java/org/deegree/geometry/package-info.java b/deegree-core/deegree-core-geometry/src/main/java/org/deegree/geometry/package-info.java deleted file mode 100644 index 9b5810ad9f..0000000000 --- a/deegree-core/deegree-core-geometry/src/main/java/org/deegree/geometry/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "geometry subsystem", debug = "placeholder to enable quick debugging, please describe further") -package org.deegree.geometry; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/package-info.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/package-info.java deleted file mode 100644 index 0c0588b556..0000000000 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "rendering subsystem") -package org.deegree.rendering; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/package-info.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/package-info.java deleted file mode 100644 index 1b8510bfa0..0000000000 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "2D rendering") -package org.deegree.rendering.r2d; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/package-info.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/package-info.java deleted file mode 100644 index 4131704c1f..0000000000 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL: svn+ssh://aschmitz@deegree.wald.intevation.de/deegree/deegree3/trunk/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/package-info.java $ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "Styles") -package org.deegree.style; - -import org.deegree.commons.annotations.PackageLoggingNotes; - diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/package-info.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/package-info.java deleted file mode 100644 index ed8b993311..0000000000 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/package-info.java +++ /dev/null @@ -1,40 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -@PackageLoggingNotes(title = "WMS service specific logging", debug = "logs all kinds of information on the layer/styles structure and how it's created", warn = "logs information on all kinds of possible problems in your requests and your setup") -package org.deegree.services.wms; - -import org.deegree.commons.annotations.PackageLoggingNotes; - From 7a9c0445d33a79907fbce92da01aabb9b3757343 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Sat, 14 May 2022 12:39:44 +0200 Subject: [PATCH 2/5] #1326 - removed @Logging notes annotations --- .../main/java/org/deegree/client/core/utils/SQLExecution.java | 2 -- .../r3d/opengl/rendering/dem/manager/TextureTileManager.java | 2 -- .../src/main/java/org/deegree/commons/jdbc/ConnectionPool.java | 2 -- .../main/java/org/deegree/commons/utils/EncodingGuesser.java | 2 -- .../coverage/raster/container/DiskBasedTileContainer.java | 2 -- .../src/main/java/org/deegree/cs/CRSIdentifiable.java | 2 -- .../src/main/java/org/deegree/cs/CoordinateTransformer.java | 2 -- .../src/main/java/org/deegree/cs/Transformer.java | 2 -- .../deegree/cs/configuration/resources/XMLFileResource.java | 2 -- .../main/java/org/deegree/cs/persistence/AbstractCRSStore.java | 2 -- .../org/deegree/cs/persistence/deegree/d3/DeegreeCRSStore.java | 2 -- .../persistence/deegree/d3/parsers/CoordinateSystemParser.java | 2 -- .../deegree/cs/persistence/deegree/d3/parsers/DatumParser.java | 2 -- .../cs/persistence/deegree/d3/parsers/DefinitionParser.java | 2 -- .../cs/persistence/deegree/d3/parsers/EllipsoidParser.java | 2 -- .../cs/persistence/deegree/d3/parsers/PrimemeridianParser.java | 2 -- .../cs/persistence/deegree/d3/parsers/ProjectionParser.java | 2 -- .../persistence/deegree/d3/parsers/TransformationParser.java | 2 -- .../main/java/org/deegree/cs/persistence/gml/GMLCRSStore.java | 2 -- .../java/org/deegree/cs/persistence/gml/GMLFileResource.java | 2 -- .../java/org/deegree/cs/persistence/proj4/PROJ4CRSStore.java | 2 -- .../org/deegree/cs/persistence/proj4/ProjFileResource.java | 2 -- .../java/org/deegree/cs/projections/cylindric/Mercator.java | 2 -- .../deegree/cs/projections/cylindric/TransverseMercator.java | 2 -- .../org/deegree/cs/transformations/TransformationFactory.java | 2 -- .../cs/transformations/coordinate/ConcatenatedTransform.java | 2 -- .../deegree/cs/transformations/coordinate/DirectTransform.java | 2 -- .../cs/transformations/coordinate/GeocentricTransform.java | 2 -- .../cs/transformations/coordinate/ProjectionTransform.java | 2 -- .../deegree/cs/transformations/ntv2/NTv2Transformation.java | 2 -- .../src/main/java/org/deegree/cs/utilities/MappingUtils.java | 2 -- .../src/main/java/org/deegree/cs/utilities/Matrix.java | 2 -- .../src/main/java/org/deegree/layer/AbstractLayer.java | 2 -- .../src/main/java/org/deegree/protocol/wms/ops/SLDParser.java | 2 -- .../java/org/deegree/rendering/r2d/Java2DRasterRenderer.java | 2 -- .../main/java/org/deegree/rendering/r2d/Java2DRenderer.java | 2 -- .../java/org/deegree/rendering/r2d/Java2DTextRenderer.java | 2 -- .../java/org/deegree/rendering/r2d/strokes/TextStroke.java | 2 -- .../org/deegree/filter/expression/custom/se/Interpolate.java | 2 -- .../main/java/org/deegree/style/persistence/sld/SLDParser.java | 2 -- .../java/org/deegree/style/se/parser/PostgreSQLReader.java | 2 -- .../java/org/deegree/style/se/parser/PostgreSQLWriter.java | 2 -- .../deegree/feature/persistence/shape/ShapeFeatureStore.java | 2 -- .../feature/persistence/simplesql/SimpleSQLFeatureStore.java | 2 -- .../org/deegree/feature/persistence/sql/SQLFeatureStore.java | 2 -- .../org/deegree/services/controller/OGCFrontController.java | 2 -- .../java/org/deegree/services/resources/ResourcesServlet.java | 2 -- .../src/main/java/org/deegree/services/wms/MapService.java | 3 --- .../src/main/java/org/deegree/services/wms/StyleRegistry.java | 2 -- .../org/deegree/services/wms/controller/WMSController.java | 2 -- .../wms/controller/capabilities/Capabilities111XMLAdapter.java | 2 -- .../wms/controller/capabilities/Capabilities130XMLAdapter.java | 2 -- .../src/main/java/org/deegree/tools/crs/CRSExporter.java | 2 -- .../src/main/java/org/deegree/tools/crs/CRSExporterBase.java | 2 -- 54 files changed, 109 deletions(-) diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java index c1758bdf4f..c61b653a4d 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java @@ -46,7 +46,6 @@ import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.JDBCUtils; import org.deegree.db.ConnectionProvider; import org.deegree.db.ConnectionProviderProvider; @@ -54,7 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@LoggingNotes(debug = "log the executed statements") public class SQLExecution implements Serializable { private static final long serialVersionUID = -5784976166723417648L; diff --git a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/dem/manager/TextureTileManager.java b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/dem/manager/TextureTileManager.java index 5af104af7c..26169dffad 100644 --- a/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/dem/manager/TextureTileManager.java +++ b/deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/opengl/rendering/dem/manager/TextureTileManager.java @@ -40,7 +40,6 @@ import java.util.LinkedHashSet; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.coordinatesystems.ICRS; import org.deegree.geometry.Envelope; import org.deegree.geometry.GeometryFactory; @@ -61,7 +60,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs information about how texture tiles are managed") public class TextureTileManager { private static final Logger LOG = getLogger( TextureTileManager.class ); diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/ConnectionPool.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/ConnectionPool.java index 3e4a8e155f..036c0927fa 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/ConnectionPool.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/ConnectionPool.java @@ -47,7 +47,6 @@ import org.apache.commons.dbcp2.PoolableConnectionFactory; import org.apache.commons.dbcp2.PoolingDataSource; import org.apache.commons.pool2.impl.GenericObjectPool; -import org.deegree.commons.annotations.LoggingNotes; import org.slf4j.Logger; /** @@ -57,7 +56,6 @@ * @author last edited by: $Author: schneider $ * @version $Revision: $, $Date: $ */ -@LoggingNotes(debug = "logs information about pool usage") public class ConnectionPool { private static final Logger LOG = getLogger( ConnectionPool.class ); diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/EncodingGuesser.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/EncodingGuesser.java index 162779c1cb..743c7342dd 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/EncodingGuesser.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/EncodingGuesser.java @@ -50,7 +50,6 @@ import java.util.TreeMap; import java.util.Map.Entry; -import org.deegree.commons.annotations.LoggingNotes; import org.slf4j.Logger; /** @@ -61,7 +60,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs information about dynamically guessing the encoding of strings/files when such information is not present") public class EncodingGuesser { private static final Logger LOG = getLogger( EncodingGuesser.class ); diff --git a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/raster/container/DiskBasedTileContainer.java b/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/raster/container/DiskBasedTileContainer.java index cc4f56f201..1c06a0181e 100644 --- a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/raster/container/DiskBasedTileContainer.java +++ b/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/raster/container/DiskBasedTileContainer.java @@ -54,7 +54,6 @@ import java.util.Iterator; import java.util.List; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.index.QTree; import org.deegree.coverage.ResolutionInfo; import org.deegree.coverage.persistence.DefaultCoverageBuilder.QTreeInfo; @@ -74,7 +73,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs when raster files could not be loaded", trace = "logs stack traces") public class DiskBasedTileContainer implements TileContainer { private static final Logger LOG = getLogger( DiskBasedTileContainer.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSIdentifiable.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSIdentifiable.java index a0c65e694f..e95df4b1aa 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSIdentifiable.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSIdentifiable.java @@ -41,7 +41,6 @@ import java.util.Arrays; import java.util.List; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.ArrayUtils; import org.deegree.cs.i18n.Messages; import org.slf4j.Logger; @@ -55,7 +54,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about metadata of Coordinate System components.") public class CRSIdentifiable implements CRSResource { private static final Logger LOG = LoggerFactory.getLogger( CRSIdentifiable.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CoordinateTransformer.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CoordinateTransformer.java index 40535fa09a..b12bb6c063 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CoordinateTransformer.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CoordinateTransformer.java @@ -41,7 +41,6 @@ import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.coordinatesystems.ICRS; import org.deegree.cs.exceptions.TransformationException; import org.deegree.cs.exceptions.UnknownCRSException; @@ -59,7 +58,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the transformation of a list of ordinates.") public class CoordinateTransformer extends Transformer { private static Logger LOG_TRANSFORM = LoggerFactory.getLogger( CoordinateTransformer.class.getCanonicalName() diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/Transformer.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/Transformer.java index 5cab71d1a5..5e4c358794 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/Transformer.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/Transformer.java @@ -39,7 +39,6 @@ import java.util.List; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.coordinatesystems.ICRS; import org.deegree.cs.exceptions.TransformationException; import org.deegree.cs.exceptions.UnknownCRSException; @@ -59,7 +58,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about created transformation chain.") public abstract class Transformer { private static final Logger LOG = getLogger( Transformer.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/resources/XMLFileResource.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/resources/XMLFileResource.java index c033849ad2..6d7bf082cc 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/resources/XMLFileResource.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/configuration/resources/XMLFileResource.java @@ -41,7 +41,6 @@ import java.net.URL; import org.apache.axiom.om.OMElement; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.XMLAdapter; import org.deegree.cs.persistence.AbstractCRSStore; import org.slf4j.Logger; @@ -57,7 +56,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about initializing the xml file.") public abstract class XMLFileResource extends XMLAdapter implements XMLResource { private static Logger LOG = LoggerFactory.getLogger( XMLFileResource.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/AbstractCRSStore.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/AbstractCRSStore.java index dfb471ded3..a417c6b968 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/AbstractCRSStore.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/AbstractCRSStore.java @@ -42,7 +42,6 @@ import java.util.HashMap; import java.util.Map; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -72,7 +71,6 @@ * the type of object the parse method awaits. * */ -@LoggingNotes(debug = "Get information about the initialization of the provider, as well as on requested objects.") public abstract class AbstractCRSStore implements CRSStore { public enum RESOURCETYPE { diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStore.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStore.java index 0852c8d975..09ea80b08a 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStore.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStore.java @@ -53,7 +53,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.stax.XMLStreamUtils; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSResource; @@ -140,7 +139,6 @@ * The return type of the {@link CRSParser#getURIAsType(String)} method * */ -@LoggingNotes(debug = "the deegree XML format provider") public class DeegreeCRSStore extends AbstractCRSStore { private static final Logger LOG = getLogger( DeegreeCRSStore.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java index fe406c3ac2..9f512ea96f 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java @@ -55,7 +55,6 @@ import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.OMElement; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.XMLParsingException; import org.deegree.commons.xml.stax.XMLStreamUtils; import org.deegree.cs.CRSCodeType; @@ -91,7 +90,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed crs, as well as a stack trace if something went wrong.") public class CoordinateSystemParser extends DefinitionParser { private static Logger LOG = LoggerFactory.getLogger( CoordinateSystemParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java index 089a382856..553df9dfff 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java @@ -49,7 +49,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.stax.XMLStreamUtils; import org.deegree.cs.CRSResource; import org.deegree.cs.components.GeodeticDatum; @@ -71,7 +70,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed datums, as well as a stack trace if something went wrong.") public class DatumParser extends DefinitionParser { private static final Logger LOG = getLogger( DatumParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java index 0438dea6a6..6b4750a041 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java @@ -56,7 +56,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.proxy.ProxySettings; import org.deegree.commons.xml.XMLParsingException; import org.deegree.commons.xml.stax.XMLStreamUtils; @@ -78,7 +77,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get stacktraces if something goes wrong.") public abstract class DefinitionParser { private static final Logger LOG = getLogger( DefinitionParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java index e1beba001f..0ca5327c65 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java @@ -51,7 +51,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.XMLParsingException; import org.deegree.cs.CRSResource; import org.deegree.cs.components.Ellipsoid; @@ -69,7 +68,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed ellipsoid, as well as a stack trace if something went wrong.") public class EllipsoidParser extends DefinitionParser { private static final Logger LOG = getLogger( EllipsoidParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java index aeca38caa0..92715e29d0 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java @@ -48,7 +48,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.XMLParsingException; import org.deegree.cs.CRSResource; import org.deegree.cs.components.PrimeMeridian; @@ -65,7 +64,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed primemeridian, as well as a stack trace if something went wrong.") public class PrimemeridianParser extends DefinitionParser { private static final Logger LOG = getLogger( PrimemeridianParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/ProjectionParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/ProjectionParser.java index fd464c285d..3f24ab5601 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/ProjectionParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/ProjectionParser.java @@ -53,7 +53,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.stax.XMLStreamUtils; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -81,7 +80,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed projections, as well as a stack trace if something went wrong.") public class ProjectionParser extends DefinitionParser { private static final Logger LOG = getLogger( ProjectionParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/TransformationParser.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/TransformationParser.java index 6c344380cf..bffba8de64 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/TransformationParser.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/TransformationParser.java @@ -57,7 +57,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.XMLParsingException; import org.deegree.commons.xml.stax.XMLStreamUtils; import org.deegree.cs.CRSCodeType; @@ -86,7 +85,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "Get information about the currently parsed transformation, as well as a stack trace if something went wrong.") public class TransformationParser extends DefinitionParser { private static final Logger LOG = getLogger( TransformationParser.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStore.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStore.java index f8ff9a4b20..64f9bea688 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStore.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStore.java @@ -52,7 +52,6 @@ import javax.xml.namespace.QName; import org.apache.axiom.om.OMElement; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.Pair; import org.deegree.commons.xml.CommonNamespaces; import org.deegree.commons.xml.NamespaceBindings; @@ -120,7 +119,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the currently parsed coordinate system components.") public class GMLCRSStore extends AbstractCRSStore { private static Logger LOG = LoggerFactory.getLogger( GMLCRSStore.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLFileResource.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLFileResource.java index 00545a98e4..394800e5c7 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLFileResource.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLFileResource.java @@ -50,7 +50,6 @@ import javax.xml.namespace.QName; import org.apache.axiom.om.OMElement; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.CommonNamespaces; import org.deegree.commons.xml.XMLAdapter; import org.deegree.commons.xml.XMLParsingException; @@ -81,7 +80,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the currently parsed transformations.") public class GMLFileResource extends XMLFileResource implements GMLResource { private static final long serialVersionUID = -4389365894942107300L; diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStore.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStore.java index 2659244bc9..8af9556047 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStore.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStore.java @@ -46,7 +46,6 @@ import javax.vecmath.Point2d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSResource; import org.deegree.cs.EPSGCode; @@ -90,7 +89,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "the proj4 format provider") public class PROJ4CRSStore extends AbstractCRSStore { private static Logger LOG = LoggerFactory.getLogger( PROJ4CRSStore.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/ProjFileResource.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/ProjFileResource.java index 7c44b30967..738ee85acd 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/ProjFileResource.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/ProjFileResource.java @@ -47,7 +47,6 @@ import java.util.Map; import java.util.Set; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.configuration.resources.CRSResource; import org.deegree.cs.coordinatesystems.GeographicCRS; @@ -70,7 +69,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about errors while parsing the proj4 file.") public class ProjFileResource implements CRSResource> { private Map> idToParams = new HashMap>( 4000 ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/Mercator.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/Mercator.java index 827c4b3c48..c21d4815ee 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/Mercator.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/Mercator.java @@ -41,7 +41,6 @@ import javax.vecmath.Point2d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; import org.deegree.cs.EPSGCode; @@ -74,7 +73,6 @@ * @version $Revision: $, $Date: $ * */ -@LoggingNotes(debug = "Get information about incoming ordinates.") public class Mercator extends CylindricalProjection implements IMercator { private static Logger LOG = LoggerFactory.getLogger( Mercator.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/TransverseMercator.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/TransverseMercator.java index 600500beaa..b17c5dc47d 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/TransverseMercator.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/projections/cylindric/TransverseMercator.java @@ -48,7 +48,6 @@ import javax.vecmath.Point2d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; import org.deegree.cs.EPSGCode; @@ -80,7 +79,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about incoming ordinates of the (inverse) projection.") public class TransverseMercator extends CylindricalProjection implements ITransverseMercator { private static Logger LOG = LoggerFactory.getLogger( TransverseMercator.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/TransformationFactory.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/TransformationFactory.java index ee8ede1fe0..c3c32d9964 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/TransformationFactory.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/TransformationFactory.java @@ -54,7 +54,6 @@ import javax.vecmath.Matrix4d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.crs.store.AbstractStore; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; @@ -109,7 +108,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the transformation steps which were 'automatically' created.") public class TransformationFactory { private static Logger LOG = LoggerFactory.getLogger( TransformationFactory.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ConcatenatedTransform.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ConcatenatedTransform.java index af2eb6681f..4a2d5e9a82 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ConcatenatedTransform.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ConcatenatedTransform.java @@ -43,7 +43,6 @@ import javax.vecmath.GMatrix; import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -66,7 +65,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the concatenation of two or more transformations.") public class ConcatenatedTransform extends Transformation { private static final Logger LOG = getLogger( ConcatenatedTransform.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/DirectTransform.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/DirectTransform.java index 6ecd9587c3..bd2c1b36b9 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/DirectTransform.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/DirectTransform.java @@ -40,7 +40,6 @@ import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -62,7 +61,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the incoming ordinates of a direct transformation.") public class DirectTransform extends Transformation { private static Logger LOG = LoggerFactory.getLogger( DirectTransform.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/GeocentricTransform.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/GeocentricTransform.java index 555caea5f8..6e52a85a1c 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/GeocentricTransform.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/GeocentricTransform.java @@ -44,7 +44,6 @@ import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -69,7 +68,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the incoming ordinates of a geocentric transformation.") public class GeocentricTransform extends Transformation { private static Logger LOG = LoggerFactory.getLogger( GeocentricTransform.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ProjectionTransform.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ProjectionTransform.java index 28f6f6ef8f..979bda968c 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ProjectionTransform.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/coordinate/ProjectionTransform.java @@ -41,7 +41,6 @@ import javax.vecmath.Point2d; import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; import org.deegree.cs.CRSResource; @@ -64,7 +63,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about axis of the projection as well as the used projection and the incoming ordinates.") public class ProjectionTransform extends Transformation { private static Logger LOG = LoggerFactory.getLogger( ProjectionTransform.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java index d92ce0e530..1f40f93b0b 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/transformations/ntv2/NTv2Transformation.java @@ -55,7 +55,6 @@ import javax.vecmath.Point3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.CRSResource; import org.deegree.cs.components.Axis; import org.deegree.cs.components.IAxis; @@ -83,7 +82,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get stack traces if an error occurred while loading / transforming (on) a gridshift file.") public class NTv2Transformation extends Transformation { private static final Logger LOG = getLogger( NTv2Transformation.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/MappingUtils.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/MappingUtils.java index 629ea30209..77fb943c5c 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/MappingUtils.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/MappingUtils.java @@ -45,7 +45,6 @@ import java.util.List; import java.util.Queue; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.coordinatesystems.ICRS; import org.deegree.cs.exceptions.TransformationException; import org.deegree.cs.transformations.Transformation; @@ -64,7 +63,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information transformation substitution process.") public class MappingUtils { private static final Logger LOG = getLogger( MappingUtils.class ); diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/Matrix.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/Matrix.java index ae3342cd84..cbc13e58da 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/Matrix.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/utilities/Matrix.java @@ -44,7 +44,6 @@ import javax.vecmath.GMatrix; import javax.vecmath.Matrix3d; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.cs.components.Axis; import org.deegree.cs.components.IAxis; import org.deegree.cs.components.IUnit; @@ -66,7 +65,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the swapping of axis and the creation of standardized values.") public class Matrix extends GMatrix { private static final Logger LOG = getLogger( Matrix.class ); diff --git a/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/AbstractLayer.java b/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/AbstractLayer.java index 2918c6e370..9732d4bfb5 100644 --- a/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/AbstractLayer.java +++ b/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/AbstractLayer.java @@ -38,7 +38,6 @@ import java.util.Map; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.CollectionUtils.Mapper; import org.deegree.layer.metadata.LayerMetadata; import org.deegree.style.StyleRef; @@ -52,7 +51,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(warn = "logs information about dimension handling") public abstract class AbstractLayer implements Layer { private final LayerMetadata metadata; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/SLDParser.java b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/SLDParser.java index 49afe178e1..61af84597c 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/SLDParser.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/main/java/org/deegree/protocol/wms/ops/SLDParser.java @@ -52,7 +52,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.tom.primitive.PrimitiveValue; import org.deegree.commons.utils.Pair; @@ -88,7 +87,6 @@ * * @author Andreas Schmitz */ -@LoggingNotes(debug = "logs which named layers were extracted from SLD") public class SLDParser { private static final Logger LOG = getLogger( SLDParser.class ); diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRasterRenderer.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRasterRenderer.java index def3fc40e0..75b7cf6751 100644 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRasterRenderer.java +++ b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRasterRenderer.java @@ -45,7 +45,6 @@ import java.awt.image.BufferedImage; import java.util.LinkedList; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.DoublePair; import org.deegree.commons.utils.Pair; import org.deegree.coverage.raster.AbstractRaster; @@ -75,7 +74,6 @@ * * @version $Revision: 19497 $, $Date: 2009-09-11 $ */ -@LoggingNotes(debug = "logs which raster style is used for rendering", trace = "logs details about the raster rendering process", warn = "logs when null rasters are rendered") public class Java2DRasterRenderer implements RasterRenderer { private static final Logger LOG = getLogger( Java2DRasterRenderer.class ); diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRenderer.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRenderer.java index 24f0df9a98..e55ef48102 100644 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRenderer.java +++ b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DRenderer.java @@ -46,7 +46,6 @@ import java.awt.geom.Path2D.Double; import java.util.Collection; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.DoublePair; import org.deegree.commons.utils.Pair; import org.deegree.geometry.Envelope; @@ -70,7 +69,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(warn = "log info about problems with the renderer setup, or broken geometries coming in, or problematic usage of the renderer", debug = "log what's funny about rendering, eg. when null geometries are rendered, general info about the renderer, also log stack traces, use for debugging/improving your styles") public class Java2DRenderer implements Renderer { private static final Logger LOG = getLogger( Java2DRenderer.class ); diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DTextRenderer.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DTextRenderer.java index 96ff68b822..c47d48a647 100644 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DTextRenderer.java +++ b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/Java2DTextRenderer.java @@ -56,7 +56,6 @@ import java.awt.geom.Point2D; import java.util.Collection; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.geometry.Geometry; import org.deegree.geometry.multi.MultiCurve; import org.deegree.geometry.multi.MultiGeometry; @@ -83,7 +82,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(warn = "logs usage of text rendering with unsupported geometry types", debug = "logs rendering of null/zero length texts/null geometries") public class Java2DTextRenderer implements TextRenderer { private static final Logger LOG = getLogger( Java2DTextRenderer.class ); diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/strokes/TextStroke.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/strokes/TextStroke.java index b4abc0bb38..b8f4f699f3 100644 --- a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/strokes/TextStroke.java +++ b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/strokes/TextStroke.java @@ -76,7 +76,6 @@ import java.util.LinkedList; import java.util.ListIterator; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.style.styling.components.LinePlacement; import org.slf4j.Logger; @@ -89,7 +88,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs which text is rendered how", trace = "logs implementation/code debugging details about text strokes") public class TextStroke implements Stroke { private static final Logger LOG = getLogger( TextStroke.class ); diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/filter/expression/custom/se/Interpolate.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/filter/expression/custom/se/Interpolate.java index 2f6cac004c..7b89bc9090 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/filter/expression/custom/se/Interpolate.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/filter/expression/custom/se/Interpolate.java @@ -60,7 +60,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.tom.TypedObjectNode; import org.deegree.commons.tom.primitive.PrimitiveValue; import org.deegree.coverage.raster.AbstractRaster; @@ -85,7 +84,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs when the fallback value is used or values cannot be parsed properly for the given type") public class Interpolate extends AbstractCustomExpression { private static final QName ELEMENT_NAME = new QName( SENS, "Interpolate" ); diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/persistence/sld/SLDParser.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/persistence/sld/SLDParser.java index d8d4b09b68..c21934dc51 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/persistence/sld/SLDParser.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/persistence/sld/SLDParser.java @@ -45,7 +45,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.style.se.parser.SymbologyParser; import org.deegree.style.se.unevaluated.Style; @@ -57,7 +56,6 @@ * * @version $Revision: 31400 $, $Date: 2011-08-02 10:11:48 +0200 (Tue, 02 Aug 2011) $ */ -@LoggingNotes(debug = "logs which named layers were extracted from SLD") public class SLDParser { /** diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLReader.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLReader.java index 15953300c1..ff29110cfe 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLReader.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLReader.java @@ -64,7 +64,6 @@ import javax.xml.stream.XMLStreamReader; import org.apache.commons.codec.binary.Base64; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.DoublePair; import org.deegree.commons.utils.JDBCUtils; import org.deegree.commons.utils.Pair; @@ -106,7 +105,6 @@ * * @version $Revision: 31398 $, $Date: 2011-08-02 09:03:40 +0200 (Tue, 02 Aug 2011) $ */ -@LoggingNotes(debug = "logs when problematic styles were found in the database", info = "logs problems when accessing the DB", trace = "logs stack traces") public class PostgreSQLReader { enum Type { diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLWriter.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLWriter.java index 346478be8f..14dbeab1e1 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLWriter.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/PostgreSQLWriter.java @@ -60,7 +60,6 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.DoublePair; import org.deegree.commons.utils.Triple; import org.deegree.db.ConnectionProvider; @@ -91,7 +90,6 @@ * * @version $Revision: 30481 $, $Date: 2011-04-18 16:10:34 +0200 (Mon, 18 Apr 2011) $ */ -@LoggingNotes(trace = "logs stack traces", info = "logs connection problems with the DB") public class PostgreSQLWriter { private static final Logger LOG = getLogger( PostgreSQLWriter.class ); diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStore.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStore.java index 05097524d5..c1dff91cea 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStore.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStore.java @@ -62,7 +62,6 @@ import javax.xml.namespace.QName; import org.apache.commons.io.IOUtils; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.index.RTree; import org.deegree.commons.tom.gml.GMLObject; import org.deegree.commons.tom.gml.property.Property; @@ -121,7 +120,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(trace = "logs stack traces", debug = "logs information about reading the files, which srs etc.", warn = "logs reasons for not setting up the store", error = "logs grave errors that were not forseen to happen") public class ShapeFeatureStore implements FeatureStore { private static final Logger LOG = getLogger( ShapeFeatureStore.class ); diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/java/org/deegree/feature/persistence/simplesql/SimpleSQLFeatureStore.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/java/org/deegree/feature/persistence/simplesql/SimpleSQLFeatureStore.java index db5268f166..bdf7ff618e 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/java/org/deegree/feature/persistence/simplesql/SimpleSQLFeatureStore.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/java/org/deegree/feature/persistence/simplesql/SimpleSQLFeatureStore.java @@ -50,7 +50,6 @@ import javax.xml.namespace.QName; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.jdbc.ResultSetIterator; import org.deegree.commons.tom.gml.GMLObject; import org.deegree.commons.tom.gml.property.Property; @@ -108,7 +107,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(info = "logs problems when connecting to the DB/getting data from the DB", debug = "logs the SQL statements sent to the SQL server", trace = "logs stack traces") public class SimpleSQLFeatureStore implements FeatureStore { static final Logger LOG = getLogger( SimpleSQLFeatureStore.class ); diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/SQLFeatureStore.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/SQLFeatureStore.java index ae9c3b0f6f..6e199882a2 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/SQLFeatureStore.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/SQLFeatureStore.java @@ -58,7 +58,6 @@ import javax.xml.namespace.QName; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.jdbc.ResultSetIterator; import org.deegree.commons.jdbc.SQLIdentifier; import org.deegree.commons.jdbc.TableName; @@ -156,7 +155,6 @@ * * @since 3.2 */ -@LoggingNotes(info = "logs particle converter initialization", debug = "logs the SQL statements sent to the SQL server and startup/shutdown information") public class SQLFeatureStore implements FeatureStore { private static final Logger LOG = getLogger( SQLFeatureStore.class ); diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java index fefed83998..fba93823e7 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java @@ -94,7 +94,6 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.LogFactory; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.concurrent.Executor; import org.deegree.commons.config.DeegreeWorkspace; import org.deegree.commons.config.ResourceInitException; @@ -156,7 +155,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs the server startup, incoming requests and timing info, also enables enhanced request logging in $HOME/.deegree") public class OGCFrontController extends HttpServlet { private static final Logger LOG = getLogger( OGCFrontController.class ); diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java index 621a1e47a2..af527c0981 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java @@ -46,7 +46,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.services.controller.OGCFrontController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +58,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(debug = "logs resource requests") public class ResourcesServlet extends HttpServlet { private static final Logger LOG = LoggerFactory.getLogger( ResourcesServlet.class ); diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java index e4e73beb84..75d308fa94 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java @@ -39,7 +39,6 @@ import static java.util.Collections.singletonList; import static org.deegree.commons.ows.exception.OWSException.LAYER_NOT_QUERYABLE; import static org.deegree.commons.ows.exception.OWSException.NO_APPLICABLE_CODE; -import static org.deegree.commons.utils.MapUtils.DEFAULT_PIXEL_SIZE; import static org.deegree.rendering.r2d.RenderHelper.calcScaleWMS130; import static org.deegree.rendering.r2d.context.MapOptionsHelper.insertMissingOptions; import static org.deegree.theme.Themes.getAllLayers; @@ -60,7 +59,6 @@ import javax.imageio.ImageIO; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.utils.Pair; import org.deegree.cs.coordinatesystems.ICRS; @@ -104,7 +102,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(error = "logs errors when querying feature stores/evaluating filter encoding expressions", trace = "logs stack traces", warn = "logs problems when loading layers, also invalid values for vendor specific parameters such as ANTIALIAS, QUALITY etc.", debug = "logs if layers are skipped because of scale constraints, and info about feature store queries") public class MapService { private static final Logger LOG = getLogger( MapService.class ); diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/StyleRegistry.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/StyleRegistry.java index d7bd088afe..c2e453a7f3 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/StyleRegistry.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/StyleRegistry.java @@ -49,7 +49,6 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.utils.Pair; import org.deegree.style.se.parser.SymbologyParser; import org.deegree.style.se.unevaluated.Style; @@ -64,7 +63,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(info = "logs when style files cannot be loaded", trace = "logs stack traces", debug = "logs information about loading/reloading of style files") public class StyleRegistry extends TimerTask { private static final Logger LOG = getLogger( StyleRegistry.class ); diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java index dabd6d5f39..ef9017dea6 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java @@ -93,7 +93,6 @@ import org.apache.axiom.soap.SOAPVersion; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.fileupload.FileItem; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.ows.metadata.ServiceIdentification; import org.deegree.commons.ows.metadata.ServiceProvider; @@ -180,7 +179,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(trace = "logs stack traces", debug = "logs sent exception messages, security information", warn = "logs problems with custom serializer classes", error = "logs unknown errors, problems with GetFeatureInfo templates") public class WMSController extends AbstractOWS { private static final Logger LOG = getLogger( WMSController.class ); diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities111XMLAdapter.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities111XMLAdapter.java index f8d6bd5bd8..28c1db1835 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities111XMLAdapter.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities111XMLAdapter.java @@ -48,7 +48,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.ows.metadata.ServiceIdentification; import org.deegree.commons.ows.metadata.ServiceProvider; import org.deegree.commons.utils.Pair; @@ -74,7 +73,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(warn = "logs problems with CRS when outputting 1.1.1 capabilities", trace = "logs stack traces") public class Capabilities111XMLAdapter extends XMLAdapter { private static final String MD_URL_REQUEST_CSW = "service=CSW&request=GetRecordById&version=2.0.2&outputSchema=http%3A//www.isotc211.org/2005/gmd&elementSetName=full&id=${metadataSetId}"; diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities130XMLAdapter.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities130XMLAdapter.java index ba4dfa7712..94f5e743f8 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities130XMLAdapter.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Capabilities130XMLAdapter.java @@ -54,7 +54,6 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.axiom.om.OMElement; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.ows.metadata.ServiceIdentification; import org.deegree.commons.ows.metadata.ServiceProvider; import org.deegree.commons.utils.Pair; @@ -80,7 +79,6 @@ * * @version $Revision$, $Date$ */ -@LoggingNotes(warn = "logs problems with CRS when outputting 1.3.0 capabilities", trace = "logs stack traces") public class Capabilities130XMLAdapter { private static final String MD_URL_REQUEST_CSW = "service=CSW&request=GetRecordById&version=2.0.2&outputSchema=http%3A//www.isotc211.org/2005/gmd&elementSetName=full&id=${metadataSetId}"; diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporter.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporter.java index cb81bd3574..a9b8344db0 100644 --- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporter.java +++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporter.java @@ -64,7 +64,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.CommonNamespaces; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSResource; @@ -110,7 +109,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the currently exported coordinate system.") public class CRSExporter extends CRSExporterBase { private static final Logger LOG = getLogger( CRSExporter.class ); diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporterBase.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporterBase.java index 3466d2b21e..c986232d29 100644 --- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporterBase.java +++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/crs/CRSExporterBase.java @@ -51,7 +51,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.deegree.commons.annotations.LoggingNotes; import org.deegree.commons.xml.CommonNamespaces; import org.deegree.commons.xml.stax.IndentingXMLStreamWriter; import org.deegree.cs.CRSCodeType; @@ -92,7 +91,6 @@ * @version $Revision$, $Date$ * */ -@LoggingNotes(debug = "Get information about the currently exported coordinate system.") public class CRSExporterBase { private static Logger LOG = LoggerFactory.getLogger( CRSExporterBase.class ); From c7fbeb376765a17e201f1b2a334a64044c570be4 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Sat, 17 Sep 2022 18:38:32 +0200 Subject: [PATCH 3/5] #1326 - removed LoggingNotes and PackageLoggingNodes annotations --- .../commons/annotations/LoggingNotes.java | 83 ----- .../annotations/PackageLoggingNotes.java | 88 ----- .../commons/log4j/DuplicateMessageFilter.java | 84 ----- .../LoggingAnnotationProcessor.java | 311 ------------------ .../commons/utils/io/RollbackPrintWriter.java | 115 ------- .../src/main/resources/log4j2.xml | 15 - 6 files changed, 696 deletions(-) delete mode 100644 deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/LoggingNotes.java delete mode 100644 deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/PackageLoggingNotes.java delete mode 100644 deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/log4j/DuplicateMessageFilter.java delete mode 100644 deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/processors/LoggingAnnotationProcessor.java delete mode 100644 deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/utils/io/RollbackPrintWriter.java delete mode 100644 deegree-core/deegree-core-annotations/src/main/resources/log4j2.xml diff --git a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/LoggingNotes.java b/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/LoggingNotes.java deleted file mode 100644 index bc7a2b8212..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/LoggingNotes.java +++ /dev/null @@ -1,83 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -package org.deegree.commons.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.SOURCE; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * DebuggingNotes - * - * @author Andreas Schmitz - * @author last edited by: $Author$ - * - * @version $Revision$, $Date$ - * @deprecated This annotation is deprecated as of version 3.4 of deegree. - */ -@Deprecated -@Retention(SOURCE) -@Target(TYPE) -public @interface LoggingNotes { - - /** - * @return the string that describes the error level logging for this class - */ - String error() default ""; - - /** - * @return the string that describes the warn level logging for this class - */ - String warn() default ""; - - /** - * @return the string that describes the info level logging for this class - */ - String info() default ""; - - /** - * @return the string that describes the debug level logging for this class - */ - String debug() default ""; - - /** - * @return the string that describes the trace level logging for this class - */ - String trace() default ""; - -} diff --git a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/PackageLoggingNotes.java b/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/PackageLoggingNotes.java deleted file mode 100644 index 622e280c0c..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/PackageLoggingNotes.java +++ /dev/null @@ -1,88 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -package org.deegree.commons.annotations; - -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.RetentionPolicy.SOURCE; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * PackageDebuggingNotes - * - * @author Andreas Schmitz - * @author last edited by: $Author$ - * - * @version $Revision$, $Date$ - * @deprecated This annotation is deprecated as of version 3.4 of deegree. - */ -@Retention(SOURCE) -@Target(PACKAGE) -@Deprecated -public @interface PackageLoggingNotes { - - /** - * @return the string that can be used as title string delimiting a log4j2.xml section - */ - String title() default ""; - - /** - * @return the string that describes the error level logging for this class - */ - String error() default ""; - - /** - * @return the string that describes the warn level logging for this class - */ - String warn() default ""; - - /** - * @return the string that describes the info level logging for this class - */ - String info() default ""; - - /** - * @return the string that describes the debug level logging for this class - */ - String debug() default ""; - - /** - * @return the string that describes the trace level logging for this class - */ - String trace() default ""; - -} diff --git a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/log4j/DuplicateMessageFilter.java b/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/log4j/DuplicateMessageFilter.java deleted file mode 100644 index 2c6d440546..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/log4j/DuplicateMessageFilter.java +++ /dev/null @@ -1,84 +0,0 @@ -//$HeadURL: svn+ssh://aschmitz@wald.intevation.org/deegree/base/trunk/resources/eclipse/files_template.xml $ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2011 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -package org.deegree.commons.log4j; - -import static org.slf4j.LoggerFactory.getLogger; - -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.filter.AbstractFilter; -import org.slf4j.Logger; - -/** - * - * @author Andreas Schmitz - * @author last edited by: $Author: stranger $ - * - * @version $Revision: $, $Date: $ - * @deprecated This class is deprecated as of version 3.4 of deegree. - */ -@Deprecated -public class DuplicateMessageFilter extends AbstractFilter { - - private static final Logger LOG = getLogger( DuplicateMessageFilter.class ); - - private String last; - - private int count; - - @Override - public Result filter( LogEvent event ) { - if ( last == null ) { - last = event.getMessage().getFormattedMessage(); - count = 0; - return Result.ACCEPT; - } - - if ( last.equals( event.getMessage().getFormattedMessage() ) ) { - ++count; - // would be cool to log (... repeated 12452 times) - if ( count % 100 == 0 ) { - LOG.warn( "Last message repeated 100 times." ); - } - return Result.DENY; - } - - last = event.getMessage().getFormattedMessage(); - count = 1; - - return Result.ACCEPT; - } - -} diff --git a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/processors/LoggingAnnotationProcessor.java b/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/processors/LoggingAnnotationProcessor.java deleted file mode 100644 index cdec34a8d6..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/processors/LoggingAnnotationProcessor.java +++ /dev/null @@ -1,311 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2009 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -package org.deegree.commons.processors; - -import static org.slf4j.LoggerFactory.getLogger; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.Set; -import java.util.TreeMap; -import java.util.Map.Entry; - -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.Processor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedOptions; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; - -import com.google.auto.service.AutoService; -import org.deegree.commons.annotations.LoggingNotes; -import org.deegree.commons.annotations.PackageLoggingNotes; -import org.deegree.commons.utils.io.RollbackPrintWriter; -import org.slf4j.Logger; - -/** - * LoggingAnnotationProcessor - * - * @author Andreas Schmitz - * @author last edited by: $Author$ - * - * @version $Revision$, $Date$ - * @deprecated This class is deprecated as of version 3.4 of deegree. - */ - -@SupportedAnnotationTypes(value = { "org.deegree.commons.annotations.PackageLoggingNotes", - "org.deegree.commons.annotations.LoggingNotes" }) -@SupportedSourceVersion(SourceVersion.RELEASE_8) -@SupportedOptions({ "log4j.outputdir" }) -@Deprecated -@AutoService(Processor.class) -public class LoggingAnnotationProcessor extends AbstractProcessor { - - private static final Logger LOG = getLogger( LoggingAnnotationProcessor.class ); - - private String outDir; - - private int width = 120; - - @Override - public void init( ProcessingEnvironment env ) { - super.init( env ); - outDir = env.getOptions().get( "log4j.outputdir" ); - if ( outDir == null ) { - outDir = System.getProperty( "java.io.tmpdir" ) + "/log4j/"; - LOG.info( "Outputting log4j snippets to '{}'.", outDir ); - } - File parentFile = new File( outDir ); - if ( !parentFile.exists() && !parentFile.mkdirs() ) { - LOG.warn( "Target directory could not be created: {}", parentFile ); - } - } - - // breaks the lines at max width - private String format( String str ) { - StringBuilder res = new StringBuilder(); - outer: while ( str.length() > ( width - 3 ) ) { - int len = 3; - res.append( "\n" ); - continue outer; - } - res.append(str.substring(0, idx + 1)); - str = str.substring(0, idx + 1); - len += idx + 1; - } - } - if ( !str.isEmpty() ) { - res.append( " -->\n" ); - } - } - if ( !str.isEmpty() ) { - res.append( "\n" ); - } - return res.toString(); - } - - private void find( Element e, Tree root ) { - LoggingNotes notes = e.getAnnotation( LoggingNotes.class ); - PackageLoggingNotes pnotes = e.getAnnotation( PackageLoggingNotes.class ); - // the #toString apparently yields the qname, is there another way? - String qname = e.toString(); - - if ( notes != null || pnotes != null ) { - root.insert( qname, pnotes, notes ); - } - - for ( Element e2 : e.getEnclosedElements() ) { - find( e2, root ); - } - } - - private void block( String text, RollbackPrintWriter out, boolean big ) { - if ( big ) { - out.print( ""); - out.println(); - } - int odd = text.length() % 2; - int len = ( width - text.length() - 4 ) / 2; - out.print( ""); - out.println(); - if ( big ) { - out.print( ""); - out.println(); - } - out.println(); - } - - @Override - public boolean process( Set annotations, RoundEnvironment roundEnv ) { - try { - Tree tree = new Tree(); - - for ( Element e : roundEnv.getRootElements() ) { - find( e, tree ); - } - - if ( tree.children.isEmpty() ) { - return true; - } - - FileOutputStream fos = new FileOutputStream( new File( outDir, "error" ) ); - PrintWriter pw = new PrintWriter( new OutputStreamWriter( fos, "UTF-8" ) ); - RollbackPrintWriter out = new RollbackPrintWriter( pw ); - tree.print( out, "", true, false, false, false, false ); - out.close(); - pw = new PrintWriter( new OutputStreamWriter( new FileOutputStream( new File( outDir, "warn" ) ), "UTF-8" ) ); - out = new RollbackPrintWriter( pw ); - tree.print( out, "", false, true, false, false, false ); - out.close(); - pw = new PrintWriter( new OutputStreamWriter( new FileOutputStream( new File( outDir, "info" ) ), "UTF-8" ) ); - out = new RollbackPrintWriter( pw ); - tree.print( out, "", false, false, true, false, false ); - out.close(); - pw = new PrintWriter( new OutputStreamWriter( new FileOutputStream( new File( outDir, "debug" ) ), "UTF-8" ) ); - out = new RollbackPrintWriter( pw ); - tree.print( out, "", false, false, false, true, false ); - out.close(); - pw = new PrintWriter( new OutputStreamWriter( new FileOutputStream( new File( outDir, "trace" ) ), "UTF-8" ) ); - out = new RollbackPrintWriter( pw ); - tree.print( out, "", false, false, false, false, true ); - out.close(); - return true; - } catch ( UnsupportedEncodingException | FileNotFoundException e ) { - e.printStackTrace(); - } - return false; - } - - class Tree { - PackageLoggingNotes pnotes; - - LoggingNotes notes; - - TreeMap children = new TreeMap<>(); - - void insert( String qname, PackageLoggingNotes pnotes, LoggingNotes notes ) { - LinkedList pkgs = new LinkedList<>( Arrays.asList( qname.split( "\\." ) ) ); - Tree node = this; - while ( true ) { - String next = pkgs.poll(); - Tree nextNode = node.children.get( next ); - if ( nextNode == null ) { - nextNode = new Tree(); - node.children.put( next, nextNode ); - } - node = nextNode; - if ( pkgs.isEmpty() ) { - node.notes = notes; - node.pnotes = pnotes; - break; - } - } - } - - void print( RollbackPrintWriter out, String qname, boolean error, boolean warn, boolean info, boolean debug, - boolean trace ) { - if ( notes != null ) { - handleNotes( out, qname, error, warn, info, debug, trace ); - } - if ( pnotes != null ) { - handlePackageNotes( out, qname, error, warn, info, debug, trace ); - } - for ( Entry entry : children.entrySet() ) { - entry.getValue().print( out, qname + ( qname.isEmpty() ? "" : "." ) + entry.getKey(), error, warn, - info, debug, trace ); - } - out.rollback(); - } - - private void handleNotes( RollbackPrintWriter out, String qname, boolean error, boolean warn, boolean info, - boolean debug, boolean trace ) { - handleNote( out, error, notes.error(), qname, "error" ); - handleNote( out, warn, notes.warn(), qname, "warn" ); - handleNote( out, info, notes.info(), qname, "info" ); - handleNote( out, debug, notes.debug(), qname, "debug" ); - handleNote( out, trace, notes.trace(), qname, "trace" ); - } - - private void handlePackageNotes( RollbackPrintWriter out, String qname, boolean error, boolean warn, - boolean info, boolean debug, boolean trace ) { - String title = pnotes.title(); - - boolean isSubsystem = qname.replaceAll( "[^.]", "" ).length() == 2; - - if ( !title.isEmpty() ) { - block( title, out, isSubsystem ); - } - - handleNote( out, error, pnotes.error(), qname, "error" ); - handleNote( out, warn, pnotes.warn(), qname, "warn" ); - handleNote( out, info, pnotes.info(), qname, "info" ); - handleNote( out, debug, pnotes.debug(), qname, "debug" ); - handleNote( out, trace, pnotes.trace(), qname, "trace" ); - } - - private void handleNote( RollbackPrintWriter out, boolean level, String note, String qname, String levelName ) { - if ( !note.isEmpty() && level ) { - out.println( format( note ) ); - out.println(""); - out.println(); - out.flush(); - } - } - - } - -} diff --git a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/utils/io/RollbackPrintWriter.java b/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/utils/io/RollbackPrintWriter.java deleted file mode 100644 index bc3d2840c6..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/utils/io/RollbackPrintWriter.java +++ /dev/null @@ -1,115 +0,0 @@ -//$HeadURL$ -/*---------------------------------------------------------------------------- - This file is part of deegree, http://deegree.org/ - Copyright (C) 2001-2010 by: - - Department of Geography, University of Bonn - - and - - lat/lon GmbH - - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; either version 2.1 of the License, or (at your option) - any later version. - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact information: - - lat/lon GmbH - Aennchenstr. 19, 53177 Bonn - Germany - http://lat-lon.de/ - - Department of Geography, University of Bonn - Prof. Dr. Klaus Greve - Postfach 1147, 53001 Bonn - Germany - http://www.geographie.uni-bonn.de/deegree/ - - e-mail: info@deegree.org - ----------------------------------------------------------------------------*/ -package org.deegree.commons.utils.io; - -import java.io.PrintWriter; -import java.util.LinkedList; - -/** - * - * @author Andreas Schmitz - * @author last edited by: $Author$ - * - * @version $Revision$, $Date$ - * @deprecated This class is deprecated as of version 3.4 of deegree. - */ -@Deprecated -public class RollbackPrintWriter { - - private PrintWriter out; - - private LinkedList list = new LinkedList(); - - /** - * @param out - */ - public RollbackPrintWriter( PrintWriter out ) { - this.out = out; - } - - /** - * - */ - public void println() { - list.add( "" ); - } - - /** - * @param s - */ - public void println( String s ) { - list.add( s ); - } - - /** - * @param s - */ - public void print( String s ) { - // string builders? - if ( list.isEmpty() ) { - list.add( s ); - } else { - s = list.getLast() + s; - list.removeLast(); - list.add( s ); - } - } - - /** - * - */ - public void flush() { - while ( !list.isEmpty() ) { - out.println( list.poll() ); - } - } - - /** - * - */ - public void rollback() { - list.clear(); - } - - /** - * - */ - public void close() { - flush(); - out.close(); - } - -} diff --git a/deegree-core/deegree-core-annotations/src/main/resources/log4j2.xml b/deegree-core/deegree-core-annotations/src/main/resources/log4j2.xml deleted file mode 100644 index fb86cc24bd..0000000000 --- a/deegree-core/deegree-core-annotations/src/main/resources/log4j2.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From a38114b58759ba0741e4535b9bdb93e813ec6c95 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Sat, 17 Sep 2022 18:47:20 +0200 Subject: [PATCH 4/5] #1326 - removed unused dependencies --- deegree-core/deegree-core-annotations/pom.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/deegree-core/deegree-core-annotations/pom.xml b/deegree-core/deegree-core-annotations/pom.xml index 7f6438e2ea..3feb422a67 100644 --- a/deegree-core/deegree-core-annotations/pom.xml +++ b/deegree-core/deegree-core-annotations/pom.xml @@ -30,24 +30,5 @@ - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - org.slf4j - slf4j-api - - - com.google.auto.service - auto-service - - - From eed64db6d3438b053a431a1fba848f2e80893bb6 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Sat, 17 Sep 2022 20:43:30 +0200 Subject: [PATCH 5/5] #1326 - added missing dependency --- deegree-core/deegree-core-workspace/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deegree-core/deegree-core-workspace/pom.xml b/deegree-core/deegree-core-workspace/pom.xml index c48f651d63..1941bb7728 100644 --- a/deegree-core/deegree-core-workspace/pom.xml +++ b/deegree-core/deegree-core-workspace/pom.xml @@ -29,6 +29,10 @@ org.reflections reflections + + org.slf4j + slf4j-api + junit junit