From 85c395a29beeea77ba80f6f12e12e42601f1c686 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 16 Nov 2010 21:24:37 +0000 Subject: [PATCH] =?UTF-8?q?Fehlerkorrektur=20an=20zwei=20TraversalAdaptern?= =?UTF-8?q?,=20Logger=20in=20PackageLoader=20private=20gemacht,=20eigenen?= =?UTF-8?q?=20Logger=20f=C3=BCr=20AbstractContentTypeLoader=20definiert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@614 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/contenttypes/AbstractContentTypeLoader.java | 4 ++++ ccm-core/src/com/arsdigita/loader/PackageLoader.java | 2 +- .../com/arsdigita/cms/contenttypes/CollectedVolume.xml | 2 +- .../com/arsdigita/cms/contenttypes/Proceedings.xml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java index e6a904b4e..567f28d4d 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java @@ -51,6 +51,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import org.apache.log4j.Logger; /** * This is the base loader that can be used by individual content types. @@ -62,6 +63,9 @@ import java.util.StringTokenizer; **/ public abstract class AbstractContentTypeLoader extends PackageLoader { + private static final Logger s_log = Logger.getLogger( + AbstractContentTypeLoader.class); + public void run(final ScriptContext ctx) { new KernelExcursion() { diff --git a/ccm-core/src/com/arsdigita/loader/PackageLoader.java b/ccm-core/src/com/arsdigita/loader/PackageLoader.java index ba36d9498..f827f3b69 100755 --- a/ccm-core/src/com/arsdigita/loader/PackageLoader.java +++ b/ccm-core/src/com/arsdigita/loader/PackageLoader.java @@ -52,7 +52,7 @@ import com.arsdigita.util.parameter.ParameterReader; */ public abstract class PackageLoader extends AbstractScript { - public final static Logger s_log = Logger.getLogger(PackageLoader.class); + private final static Logger s_log = Logger.getLogger(PackageLoader.class); public static boolean exists(Connection conn, String table) { try { diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/CollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/CollectedVolume.xml index 4cdebbf1a..12e202a98 100644 --- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/CollectedVolume.xml +++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/CollectedVolume.xml @@ -7,7 +7,7 @@ + extends="com.arsdigita.cms.contenttypes.PublicationWithPublisher"> diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml index d6aa04475..14c27a909 100644 --- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml +++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml @@ -7,7 +7,7 @@ + extends="com.arsdigita.cms.contenttypes.PublicationWithPublisher">