You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/04/29 23:30:09 UTC
svn commit: r398238 [1/2] - in
/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya: ac/ ac/cifs/
ac/file/ ac/impl/ ac/ldap/ cms/authoring/ cms/cocoon/acting/
cms/cocoon/flow/ cms/cocoon/generation/ cms/cocoon/task/
cms/cocoon/transformation/ cms/mai...
Author: antonio
Date: Sat Apr 29 14:30:03 2006
New Revision: 398238
URL: http://svn.apache.org/viewcvs?rev=398238&view=rev
Log:
Use o.a.log4j.Logger instead of deprecated o.a.log4j.Category.
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Identity.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Password.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/cifs/CIFSUser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileItemManager.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractIPRange.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractUser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/UploadHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ValidateAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/Configuration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/task/CocoonTaskWrapper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/mail/MailTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/CollectionImpl.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreImpl.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/PublicationFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/XlinkCollection.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/task/PublicationTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/DefaultFilePublisher.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/PublishingEnvironment.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourceFilePublisher.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourcePublishingEnvironment.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/Configuration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RevisionController.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/AbstractSchedulerListener.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerStore.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJob.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJobFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/TaskJob.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/xml/TriggerHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/LuceneTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/Notifier.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/ParameterWrapper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskManager.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskSequence.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/IndexConfiguration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/ReTokenizeFile.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractDocumentCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractIndexer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableDocumentCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableIndexer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexInformation.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/parser/HTMLParserFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/parser/PreParser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/parser/SwingHTMLHandler.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/Configuration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/InetAddressUtil.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/ProxyManager.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/SMTP.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/WGet.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/search/crawler/CrawlerConfiguration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/search/crawler/IterativeHTMLCrawler.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/CacheMap.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/FileUtil.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/HTMLHandler.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/Log4Echo.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/SED.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/SSI.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/ServletHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/util/XPSFileOutputStream.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/workflow/impl/BooleanVariableCondition.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/workflow/impl/SynchronizedWorkflowInstancesImpl.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/workflow/impl/TransitionImpl.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/workflow/impl/WorkflowInstanceImpl.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/Configuration.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/DOMParserFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/DOMUtil.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/DOMWriter.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/RelaxNG.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/XPSAssembler.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/XPSSourceInformation.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/XPointerFactory.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/xml/xpointer/XalanXPointer.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Identity.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Identity.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Identity.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Identity.java Sat Apr 29 14:30:03 2006
@@ -24,7 +24,7 @@
import java.util.Set;
import org.apache.cocoon.environment.Session;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Identity object. Used to store the authenticated accreditables in the session.
@@ -32,7 +32,7 @@
public class Identity implements Identifiable, java.io.Serializable {
private Set identifiables = new HashSet();
- private static final Category log = Category.getInstance(Identity.class);
+ private static final Logger log = Logger.getLogger(Identity.class);
/**
* Ctor.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Password.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Password.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Password.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/Password.java Sat Apr 29 14:30:03 2006
@@ -15,20 +15,20 @@
*
*/
-/* $Id: Password.java,v 1.4 2004/08/16 16:21:22 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.ac;
import java.security.MessageDigest;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Encrypt plain text password
* Example: "message digest" becomes "f96b697d7cb7938d525a2f31aaf161d0" (hexadecimal notation (32 characters))
*/
public class Password {
- private static Category log = Category.getInstance(Password.class);
+ private static Logger log = Logger.getLogger(Password.class);
/**
* CLI
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/cifs/CIFSUser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/cifs/CIFSUser.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/cifs/CIFSUser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/cifs/CIFSUser.java Sat Apr 29 14:30:03 2006
@@ -22,7 +22,6 @@
import org.apache.lenya.ac.file.FileUser;
-import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.apache.avalon.framework.configuration.Configuration;
@@ -43,7 +42,7 @@
public class CIFSUser extends FileUser {
private static Properties defaultProperties = null;
- private static Category log = Logger.getLogger(CIFSUser.class);
+ private static Logger log = Logger.getLogger(CIFSUser.class);
// The name for the cifs.properties domain controller lookup
private static final String DOMAIN_CONTROLLER = "domain-controller";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileItemManager.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileItemManager.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileItemManager.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileItemManager.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: FileItemManager.java,v 1.8 2004/08/16 15:59:51 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.ac.file;
@@ -39,16 +39,16 @@
import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.ItemManagerListener;
import org.apache.lenya.ac.impl.ItemConfiguration;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Abstract superclass for classes that manage items loaded from configuration files.
*/
public abstract class FileItemManager {
- private static final Category log = Category.getInstance(FileItemManager.class);
+ private static final Logger log = Logger.getLogger(FileItemManager.class);
public static final String PATH = "config" + File.separator + "ac" + File.separator + "passwd";
-
+
private Map items = new HashMap();
private File configurationDirectory;
private DirectoryChangeNotifier notifier;
@@ -400,7 +400,7 @@
private File directory;
private FileFilter filter;
private Map canonicalPath2LastModified = new HashMap();
- private static final Category log = Category.getInstance(DirectoryChangeNotifier.class);
+ private static final Logger log = Logger.getLogger(DirectoryChangeNotifier.class);
private Set addedFiles = new HashSet();
private Set removedFiles = new HashSet();
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractIPRange.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractIPRange.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractIPRange.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractIPRange.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: AbstractIPRange.java,v 1.7 2004/08/16 16:34:06 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.ac.impl;
@@ -28,7 +28,7 @@
import org.apache.lenya.ac.IPRange;
import org.apache.lenya.ac.Machine;
import org.apache.lenya.net.InetAddressUtil;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* <p>
@@ -69,7 +69,7 @@
* FIXME II (from the previous version): why are we in the business of implementing IP ranges??
*/
- private static final Category log = Category.getInstance(AbstractIPRange.class);
+ private static final Logger log = Logger.getLogger(AbstractIPRange.class);
/**
* Initializes the the IP range with the local host (127.0.0.1/24 for IPv4, ::1/128 for IPv6).
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractUser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractUser.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractUser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/impl/AbstractUser.java Sat Apr 29 14:30:03 2006
@@ -20,15 +20,15 @@
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Password;
import org.apache.lenya.ac.User;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Abstract user implementation.
- * @version $Id: AbstractUser.java,v 1.4 2004/08/16 16:34:06 andreas Exp $
+ * @version $Id$
*/
public abstract class AbstractUser extends AbstractGroupable implements User {
- private static Category log = Category.getInstance(AbstractUser.class);
+ private static Logger log = Logger.getLogger(AbstractUser.class);
private String email;
private String encryptedPassword;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java Sat Apr 29 14:30:03 2006
@@ -37,7 +37,6 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.file.FileUser;
-import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import com.sun.jndi.ldap.LdapCtxFactory;
@@ -49,7 +48,7 @@
*/
public class LDAPUser extends FileUser {
private Properties defaultProperties = null;
- private static Category log = Logger.getLogger(LDAPUser.class);
+ private static Logger log = Logger.getLogger(LDAPUser.class);
public static final String LDAP_ID = "ldapid";
private static String LDAP_PROPERTIES_FILE = "ldap.properties";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java Sat Apr 29 14:30:03 2006
@@ -19,14 +19,14 @@
package org.apache.lenya.cms.authoring;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lenya.cms.publication.Publication;
import java.io.File;
public class DefaultBranchCreator extends DefaultCreator {
- private Category log = Category.getInstance(DefaultBranchCreator.class);
+ private Logger log = Logger.getLogger(DefaultBranchCreator.class);
/**
* Return the child type.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java Sat Apr 29 14:30:03 2006
@@ -26,11 +26,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.xml.DocumentHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
public abstract class DefaultCreator implements ParentChildCreatorInterface {
- private static Category log = Category.getInstance(DefaultCreator.class);
+ private static Logger log = Logger.getLogger(DefaultCreator.class);
public static final String RESOURCE_NAME = "resource-name";
public static final String RESOURCE_META_NAME = "resource-meta-name";
public static final String SAMPLE_NAME = "sample-name";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java Sat Apr 29 14:30:03 2006
@@ -30,13 +30,13 @@
import org.apache.lenya.cms.publication.Label;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
*
*/
public class DocumentCreator {
- private static Category log = Category.getInstance(DocumentCreator.class);
+ private static Logger log = Logger.getLogger(DocumentCreator.class);
/**
* DOCUMENT ME!
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/UploadHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/UploadHelper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/UploadHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/UploadHelper.java Sat Apr 29 14:30:03 2006
@@ -13,7 +13,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.servlet.multipart.Part;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import java.io.File;
import java.io.FileOutputStream;
@@ -29,7 +29,7 @@
*/
public class UploadHelper {
- private static final Category log = Category.getInstance(UploadHelper.class);
+ private static final Logger log = Logger.getLogger(UploadHelper.class);
private File directory;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java Sat Apr 29 14:30:03 2006
@@ -42,19 +42,17 @@
import org.apache.lenya.cms.publication.Label;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationFactory;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.io.SAXReader;
-
/**
* DOCUMENT ME!
*/
public class DefaultCreatorAction extends AbstractComplementaryConfigurableAction implements Configurable {
- Category log = Category.getInstance(DefaultCreatorAction.class);
+ Logger log = Logger.getLogger(DefaultCreatorAction.class);
private String docsPath = null;
private String doctypesPath = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/OneFormEditorSaveAction.java Sat Apr 29 14:30:03 2006
@@ -36,7 +36,7 @@
import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.RelaxNG;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.xml.sax.SAXException;
/**
@@ -45,7 +45,7 @@
public class OneFormEditorSaveAction
extends AbstractConfigurableAction
implements ThreadSafe {
- Category log = Category.getInstance(OneFormEditorSaveAction.class);
+ Logger log = Logger.getLogger(OneFormEditorSaveAction.class);
/**
* Save data to temporary file
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ReservedCheckoutAction.java,v 1.18 2004/05/22 19:43:41 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.acting;
@@ -26,13 +26,13 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.rc.FileReservedCheckOutException;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Action doing reserved checkout
*/
public class ReservedCheckoutAction extends RevisionControllerAction {
- Category log = Category.getInstance(ReservedCheckoutAction.class);
+ Logger log = Logger.getLogger(ReservedCheckoutAction.class);
/**
* DOCUMENT ME!
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Sat Apr 29 14:30:03 2006
@@ -38,10 +38,10 @@
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.rc.RCEnvironment;
import org.apache.lenya.cms.rc.RevisionController;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class RevisionControllerAction extends AbstractAction {
- Category log = Category.getInstance(RevisionControllerAction.class);
+ Logger log = Logger.getLogger(RevisionControllerAction.class);
private String rcmlDirectory = null;
private String backupDirectory = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ValidateAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ValidateAction.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ValidateAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ValidateAction.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ValidateAction.java,v 1.10 2004/03/18 14:51:58 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.acting;
@@ -39,7 +39,7 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.RelaxNG;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -47,7 +47,7 @@
* Action to validate an xml document with relax ng schema.
*/
public class ValidateAction extends AbstractConfigurableAction {
- Category log = Category.getInstance(ValidateAction.class);
+ Logger log = Logger.getLogger(ValidateAction.class);
/** (non-Javadoc)
* @see org.apache.cocoon.acting.Action#act(org.apache.cocoon.environment.Redirector, org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java Sat Apr 29 14:30:03 2006
@@ -46,7 +46,7 @@
import org.apache.lenya.cms.workflow.WorkflowFactory;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowException;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Flowscript utility class.
@@ -56,7 +56,7 @@
*/
public class FlowHelper {
- private static final Category log = Category.getInstance(FlowHelper.class);
+ private static final Logger log = Logger.getLogger(FlowHelper.class);
/**
* Ctor.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/Configuration.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/Configuration.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/Configuration.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/Configuration.java Sat Apr 29 14:30:03 2006
@@ -1,17 +1,33 @@
-package org.apache.lenya.cms.cocoon.generation;
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+/* $Id: ProxyGenerator.java 332837 2005-11-12 21:06:37Z michi $ */
+package org.apache.lenya.cms.cocoon.generation;
import java.net.URL;
import java.util.Properties;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* Read configuration
*/
public class Configuration {
- static Category log = Category.getInstance(Configuration.class);
+ static Logger log = Logger.getLogger(Configuration.class);
public static final String DEFAULT_CONFIGURATION_FILE = "org/apache/lenya/cms/cocoon/generation/conf.properties";
public static final String DEFAULT_CONFIGURATION_KEY = "lenya.configuration";
public static final String OVERRIDE_DEFAULT_CONFIGURATION_KEY = "override.lenya.configuration";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java Sat Apr 29 14:30:03 2006
@@ -40,14 +40,14 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.excalibur.xml.sax.SAXParser;
import org.apache.lenya.cms.cocoon.generation.Configuration;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public class ProxyGenerator extends org.apache.cocoon.generation.ServletGenerator implements
Parameterizable {
- private static Category log = Category.getInstance(ProxyGenerator.class);
+ private static Logger log = Logger.getLogger(ProxyGenerator.class);
private static String trustStore = null;
private static String trustStorePassword = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/task/CocoonTaskWrapper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/task/CocoonTaskWrapper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/task/CocoonTaskWrapper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/task/CocoonTaskWrapper.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: CocoonTaskWrapper.java,v 1.10 2004/06/28 08:29:46 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.task;
@@ -41,14 +41,14 @@
import org.apache.lenya.cms.task.WorkflowInvoker;
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.util.ServletHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Task wrapper to be used from Cocoon components.
*/
public class CocoonTaskWrapper extends DefaultTaskWrapper {
- private static Category log = Category.getInstance(CocoonTaskWrapper.class);
+ private static Logger log = Logger.getLogger(CocoonTaskWrapper.class);
/**
* Ctor to be called from a Cocoon component.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java Sat Apr 29 14:30:03 2006
@@ -55,8 +55,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* This is a simple transformer which rewrites <a
@@ -77,7 +76,7 @@
public class SimpleLinkRewritingTransformer extends AbstractSAXTransformer
implements Disposable {
- Category log = Category.getInstance(SimpleLinkRewritingTransformer.class);
+ Logger log = Logger.getLogger(SimpleLinkRewritingTransformer.class);
private String baseURI;
private PageEnvelope envelope = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/mail/MailTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/mail/MailTask.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/mail/MailTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/mail/MailTask.java Sat Apr 29 14:30:03 2006
@@ -19,7 +19,6 @@
package org.apache.lenya.cms.mail;
-
import java.io.File;
import java.net.URL;
import java.util.Arrays;
@@ -29,13 +28,12 @@
import org.apache.lenya.net.SMTP;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-
/**
* A task that sends an e-mail. Each parameter can either be provided as a task parameter or
* extracted from an XML document. If the parameter "uri" starts with a <code>http://</code> or
@@ -64,7 +62,7 @@
* > </mail:mail><br/></code>
*/
public class MailTask extends AbstractTask {
- private static Category log = Category.getInstance(MailTask.class);
+ private static Logger log = Logger.getLogger(MailTask.class);
public static final String ELEMENT_TO = "to";
public static final String ELEMENT_CC = "cc";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Sat Apr 29 14:30:03 2006
@@ -29,13 +29,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.lenya.cms.publishing.PublishingEnvironment;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* A publication.
*/
public abstract class AbstractPublication implements Publication {
- private static Category log = Category.getInstance(AbstractPublication.class);
+ private static Logger log = Logger.getLogger(AbstractPublication.class);
private static final String[] areas = { AUTHORING_AREA, STAGING_AREA, LIVE_AREA, ADMIN_AREA,
ARCHIVE_AREA, TRASH_AREA, INFO_AREA_PREFIX + AUTHORING_AREA,
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/CollectionImpl.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/CollectionImpl.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/CollectionImpl.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/CollectionImpl.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: CollectionImpl.java,v 1.13 2004/07/10 22:59:55 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -28,7 +28,7 @@
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -40,7 +40,7 @@
*/
public class CollectionImpl extends DefaultDocument implements Collection {
- private static final Category log = Category.getInstance(CollectionImpl.class);
+ private static final Logger log = Logger.getLogger(CollectionImpl.class);
/**
* Ctor.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java Sat Apr 29 14:30:03 2006
@@ -19,7 +19,7 @@
package org.apache.lenya.cms.publication;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Facade to get the DublinCore through the cms Document
@@ -32,7 +32,7 @@
private DublinCoreHelper() {
}
- private static Category log = Category.getInstance(DublinCoreHelper.class);
+ private static Logger log = Logger.getLogger(DublinCoreHelper.class);
/**
* Get the value of the DCIdentifier corresponding to a document id.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreImpl.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreImpl.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreImpl.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreImpl.java Sat Apr 29 14:30:03 2006
@@ -33,7 +33,7 @@
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -44,7 +44,7 @@
* This class uses the dublin core specification from 2003-03-04.
*/
public class DublinCoreImpl {
- private static final Category log = Category.getInstance(DublinCoreImpl.class);
+ private static final Logger log = Logger.getLogger(DublinCoreImpl.class);
private Document cmsdocument;
private File infofile;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/PublicationFactory.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/PublicationFactory.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/PublicationFactory.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/PublicationFactory.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: PublicationFactory.java,v 1.27 2004/06/28 08:32:13 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -32,14 +32,14 @@
import org.apache.excalibur.source.SourceUtil;
import org.apache.lenya.cms.publication.file.FilePublication;
import org.apache.lenya.util.ServletHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Factory for creating publication objects.
*/
public final class PublicationFactory {
- private static Category log = Category.getInstance(PublicationFactory.class);
+ private static Logger log = Logger.getLogger(PublicationFactory.class);
/**
* Create a new <code>PublicationFactory</code>.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/XlinkCollection.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/XlinkCollection.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/XlinkCollection.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/XlinkCollection.java Sat Apr 29 14:30:03 2006
@@ -23,7 +23,7 @@
import org.apache.lenya.xml.NamespaceHelper;
import org.apache.lenya.xml.XLink;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
@@ -35,7 +35,7 @@
*/
public class XlinkCollection extends CollectionImpl {
- private static final Category log = Category.getInstance(XlinkCollection.class);
+ private static final Logger log = Logger.getLogger(XlinkCollection.class);
/**
* Ctor.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/task/PublicationTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/task/PublicationTask.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/task/PublicationTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/task/PublicationTask.java Sat Apr 29 14:30:03 2006
@@ -43,14 +43,14 @@
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.SynchronizedWorkflowInstances;
import org.apache.lenya.workflow.WorkflowException;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Abstract super class for publication-based tasks.
*/
public abstract class PublicationTask extends AbstractTask {
- private static final Category log = Category.getInstance(PublicationTask.class);
+ private static final Logger log = Logger.getLogger(PublicationTask.class);
private Publication publication;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java Sat Apr 29 14:30:03 2006
@@ -43,15 +43,14 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* Helper class for finding references to the current document.
*/
public class DocumentReferencesHelper {
- private static final Category log = Category.getInstance(DocumentReferencesHelper.class);
+ private static final Logger log = Logger.getLogger(DocumentReferencesHelper.class);
private PageEnvelope pageEnvelope = null;
private Publication publication = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/DefaultFilePublisher.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/DefaultFilePublisher.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/DefaultFilePublisher.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/DefaultFilePublisher.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DefaultFilePublisher.java,v 1.23 2004/03/01 16:18:18 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publishing;
@@ -26,8 +26,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.lenya.cms.task.ExecutionException;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* The <code>DefaultFilePublisher</code> is a task that copies XML
@@ -47,7 +46,7 @@
* * @deprecated use the publish ant task instead.
*/
public class DefaultFilePublisher extends AbstractFilePublisher {
- private static Category log = Category.getInstance(DefaultFilePublisher.class);
+ private static Logger log = Logger.getLogger(DefaultFilePublisher.class);
public static final String PARAMETER_SOURCES = "sources";
/**
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/PublishingEnvironment.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/PublishingEnvironment.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/PublishingEnvironment.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/PublishingEnvironment.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: PublishingEnvironment.java,v 1.26 2004/03/01 16:18:18 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publishing;
@@ -24,11 +24,10 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
public class PublishingEnvironment implements Configurable {
- private static Category log = Category.getInstance(PublishingEnvironment.class);
+ private static Logger log = Logger.getLogger(PublishingEnvironment.class);
public static final String CONFIGURATION_FILE = "config" + File.separator + "publishing" +
File.separator + "publisher.xconf";
public static final String PUBLICATION_PREFIX = "lenya" + File.separator + "pubs" +
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourceFilePublisher.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourceFilePublisher.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourceFilePublisher.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourceFilePublisher.java Sat Apr 29 14:30:03 2006
@@ -28,8 +28,7 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.lenya.cms.task.ExecutionException;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* The <code>ResourceFilePublisher</code> is a task that extends the
@@ -49,7 +48,7 @@
* @deprecated use the publish ant task instead.
*/
public class ResourceFilePublisher extends DefaultFilePublisher {
- private static Category log = Category.getInstance(ResourceFilePublisher.class);
+ private static Logger log = Logger.getLogger(ResourceFilePublisher.class);
/**
* (non-Javadoc)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourcePublishingEnvironment.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourcePublishingEnvironment.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourcePublishingEnvironment.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/ResourcePublishingEnvironment.java Sat Apr 29 14:30:03 2006
@@ -15,21 +15,20 @@
*
*/
-/* $Id: ResourcePublishingEnvironment.java,v 1.8 2004/03/01 16:18:18 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publishing;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* DOCUMENT ME!
*
*/
public class ResourcePublishingEnvironment extends PublishingEnvironment {
- private static Category log = Category.getInstance(ResourcePublishingEnvironment.class);
+ private static Logger log = Logger.getLogger(ResourcePublishingEnvironment.class);
public static final String PARAMETER_RESOURCE_AUTHORING_PATH = "resources-authoring-path";
public static final String PARAMETER_RESOURCE_LIVE_PATH = "resources-live-path";
private String resourceAuthoringPath;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publishing/StaticHTMLExporter.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: StaticHTMLExporter.java,v 1.20 2004/03/01 16:18:18 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publishing;
@@ -25,8 +25,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.lenya.cms.task.ExecutionException;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* This Exporter uses WGet to download HTML files from URIs and saves them. The Task parameters
@@ -40,7 +39,7 @@
* the path<br/>
*/
public class StaticHTMLExporter extends AbstractExporter {
- private static Category log = Category.getInstance(StaticHTMLExporter.class);
+ private static Logger log = Logger.getLogger(StaticHTMLExporter.class);
public static final String PARAMETER_URIS = "uris";
/**
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/Configuration.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/Configuration.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/Configuration.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/Configuration.java Sat Apr 29 14:30:03 2006
@@ -15,20 +15,19 @@
*
*/
-/* $Id: Configuration.java,v 1.16 2004/03/01 16:18:22 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.rc;
import java.util.Properties;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* Reads conf.properties
*/
public class Configuration {
- private static Category log = Category.getInstance(Configuration.class);
+ private static Logger log = Logger.getLogger(Configuration.class);
private String rcmlDirectory = null;
private String backupDirectory = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCEnvironment.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCEnvironment.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCEnvironment.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: RCEnvironment.java,v 1.7 2004/03/01 16:18:22 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.rc;
@@ -26,10 +26,10 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class RCEnvironment implements Configurable {
- private static Category log = Category.getInstance(RCEnvironment.class);
+ private static Logger log = Logger.getLogger(RCEnvironment.class);
public static final String CONFIGURATION_FILE = "lenya" + File.separator + "config" +
File.separator + "rc" + File.separator + "revision-controller.xconf";
public static final String RCML_DIRECTORY = "rcml-directory";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: RCML.java,v 1.27 2004/08/15 04:23:03 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.rc;
@@ -31,7 +31,7 @@
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.apache.lenya.xml.XPointerFactory;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -41,7 +41,7 @@
* Handle with the RCML file
*/
public class RCML {
- private static Category log = Category.getInstance(RCML.class);
+ private static Logger log = Logger.getLogger(RCML.class);
public static final short co = 0;
public static final short ci = 1;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RevisionController.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RevisionController.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RevisionController.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RevisionController.java Sat Apr 29 14:30:03 2006
@@ -27,16 +27,14 @@
import java.io.OutputStream;
import java.util.Date;
-import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.util.XPSFileOutputStream;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* Controller for the reserved check-in, check-out, the backup versions and the rollback
*/
public class RevisionController {
- private static Category log = Category.getInstance(RevisionController.class);
+ private static Logger log = Logger.getLogger(RevisionController.class);
// System username. This is used for
// - creating dummy checkin events in a new RCML file
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/AbstractSchedulerListener.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/AbstractSchedulerListener.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/AbstractSchedulerListener.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/AbstractSchedulerListener.java Sat Apr 29 14:30:03 2006
@@ -15,18 +15,18 @@
*
*/
-/* $Id: AbstractSchedulerListener.java,v 1.2 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.SchedulerException;
import org.quartz.SchedulerListener;
import org.quartz.Trigger;
public class AbstractSchedulerListener implements SchedulerListener {
- private static final Category log = Category.getInstance(AbstractSchedulerListener.class);
+ private static final Logger log = Logger.getLogger(AbstractSchedulerListener.class);
/**
* @see org.quartz.SchedulerListener#jobScheduled(org.quartz.Trigger)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: LoadQuartzServlet.java,v 1.38 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
@@ -47,7 +47,7 @@
import org.apache.lenya.cms.scheduler.xml.TriggerHelper;
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.xml.DocumentHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.SchedulerException;
import org.w3c.dom.Document;
@@ -55,7 +55,7 @@
* A simple servlet that starts an instance of a Quartz scheduler.
*/
public class LoadQuartzServlet extends HttpServlet {
- private static Category log = Category.getInstance(LoadQuartzServlet.class);
+ private static Logger log = Logger.getLogger(LoadQuartzServlet.class);
private static SchedulerWrapper scheduler = null;
private ServletContext servletContext;
private String schedulerConfigurations;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerStore.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerStore.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerStore.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerStore.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: SchedulerStore.java,v 1.4 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
@@ -31,7 +31,7 @@
import org.apache.lenya.cms.scheduler.xml.TriggerHelper;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.JobDetail;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
@@ -47,7 +47,7 @@
public static final String ELEMENT_JOB = "job";
public static final String TITLE_ELEMENT = "title";
- private static final Category log = Category.getInstance(SchedulerStore.class);
+ private static final Logger log = Logger.getLogger(SchedulerStore.class);
public static final String SNAPSHOT_FILE =
"config/scheduler/jobs.xml".replace('/', File.separatorChar);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: SchedulerWrapper.java,v 1.29 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
@@ -36,7 +36,7 @@
import org.apache.lenya.cms.publication.PublicationFactory;
import org.apache.lenya.cms.scheduler.xml.TriggerHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
@@ -49,7 +49,7 @@
public class SchedulerWrapper {
- private static Category log = Category.getInstance(SchedulerWrapper.class);
+ private static Logger log = Logger.getLogger(SchedulerWrapper.class);
public static final String JOB_PREFIX = "job";
public static final String JOB_ID = "id";
private static int jobId = 0;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJob.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJob.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJob.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJob.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ServletJob.java,v 1.18 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
@@ -23,7 +23,7 @@
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -35,7 +35,7 @@
*/
public abstract class ServletJob implements Job {
- private static Category log = Category.getInstance(ServletJob.class);
+ private static Logger log = Logger.getLogger(ServletJob.class);
/**
* Creates the job data from an HTTP request.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJobFactory.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJobFactory.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJobFactory.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/ServletJobFactory.java Sat Apr 29 14:30:03 2006
@@ -15,11 +15,11 @@
*
*/
-/* $Id: ServletJobFactory.java,v 1.12 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
@@ -33,7 +33,7 @@
private ServletJobFactory() {
}
- private static Category log = Category.getInstance(ServletJobFactory.class);
+ private static Logger log = Logger.getLogger(ServletJobFactory.class);
/**
* Creates a job.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/TaskJob.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/TaskJob.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/TaskJob.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/TaskJob.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: TaskJob.java,v 1.39 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler;
@@ -31,7 +31,7 @@
import org.apache.lenya.cms.task.TaskWrapper;
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -44,7 +44,7 @@
* request parameter.
*/
public class TaskJob extends ServletJob {
- private static Category log = Category.getInstance(TaskJob.class);
+ private static Logger log = Logger.getLogger(TaskJob.class);
/**
* Un-prefix the parameters.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/xml/TriggerHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/xml/TriggerHelper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/xml/TriggerHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/xml/TriggerHelper.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: TriggerHelper.java,v 1.19 2004/03/01 16:18:26 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.scheduler.xml;
@@ -28,13 +28,12 @@
import org.apache.lenya.cms.scheduler.SchedulerStore;
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.quartz.CronTrigger;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
import org.w3c.dom.Element;
-
/**
* Utility class to work with trigger XML.
*/
@@ -46,7 +45,7 @@
private TriggerHelper() {
}
- private static Category log = Category.getInstance(TriggerHelper.class);
+ private static Logger log = Logger.getLogger(TriggerHelper.class);
public static final String YEAR = "year";
public static final String MONTH = "month";
public static final String DAY = "day";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DefaultTaskWrapper.java,v 1.11 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -35,12 +35,12 @@
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Element;
public class DefaultTaskWrapper implements TaskWrapper {
- private static Category log = Category.getInstance(DefaultTaskWrapper.class);
+ private static Logger log = Logger.getLogger(DefaultTaskWrapper.class);
private Map parameters = new HashMap();
private TaskWrapperParameters wrapperParameters =
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/LuceneTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/LuceneTask.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/LuceneTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/LuceneTask.java Sat Apr 29 14:30:03 2006
@@ -1,8 +1,8 @@
-/* $Id: LuceneTask.java,v 1.2 2004/08/02 00:19:42 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import java.io.File;
@@ -10,7 +10,7 @@
import org.apache.lenya.lucene.index.Indexer;
public class LuceneTask extends AbstractTask {
- Category log = Category.getInstance(LuceneTask.class);
+ Logger log = Logger.getLogger(LuceneTask.class);
/**
* @see org.apache.lenya.cms.task.Task#execute(java.lang.String)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/Notifier.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/Notifier.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/Notifier.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/Notifier.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: Notifier.java,v 1.8 2004/07/10 23:15:54 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -25,11 +25,11 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.lenya.util.NamespaceMap;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class Notifier extends ParameterWrapper {
- private static Category log = Category.getInstance(Notifier.class);
+ private static Logger log = Logger.getLogger(Notifier.class);
public static final String PREFIX = "notification";
public static final String TARGET = "notification";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/ParameterWrapper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/ParameterWrapper.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/ParameterWrapper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/ParameterWrapper.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ParameterWrapper.java,v 1.2 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -25,11 +25,11 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.lenya.util.NamespaceMap;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public abstract class ParameterWrapper {
- private static Category log = Category.getInstance(ParameterWrapper.class);
+ private static Logger log = Logger.getLogger(ParameterWrapper.class);
private NamespaceMap parameters;
/**
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskFactory.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskFactory.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskFactory.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskFactory.java Sat Apr 29 14:30:03 2006
@@ -15,13 +15,13 @@
*
*/
-/* $Id: TaskFactory.java,v 1.14 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class TaskFactory {
@@ -33,7 +33,7 @@
}
private static TaskFactory factory;
- private static Category log = Category.getInstance(TaskFactory.class);
+ private static Logger log = Logger.getLogger(TaskFactory.class);
/**
* DOCUMENT ME!
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskManager.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskManager.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskManager.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskManager.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: TaskManager.java,v 1.22 2004/03/01 16:18:19 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -28,11 +28,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.xml.sax.SAXException;
public class TaskManager implements Configurable {
- private static Category log = Category.getInstance(TaskManager.class);
+ private static Logger log = Logger.getLogger(TaskManager.class);
public static final String TASK_ELEMENT = "task";
public static final String TASK_ID_ATTRIBUTE = "id";
public static final String CONFIGURATION_FILE =
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskSequence.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskSequence.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskSequence.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/TaskSequence.java Sat Apr 29 14:30:03 2006
@@ -15,21 +15,20 @@
*
*/
-/* $Id: TaskSequence.java,v 1.15 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log4j.Category;
-
+import org.apache.log4j.Logger;
/**
* A TaskSequence contains of multiple tasks that are executed successively.
*/
public class TaskSequence extends AbstractTask {
- private static Category log = Category.getInstance(TaskSequence.class);
+ private static Logger log = Logger.getLogger(TaskSequence.class);
// keeps the task order
private Task[] tasks;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: WorkflowInvoker.java,v 1.10 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -33,11 +33,11 @@
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.SynchronizedWorkflowInstances;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class WorkflowInvoker extends ParameterWrapper {
- private static Category log = Category.getInstance(WorkflowInvoker.class);
+ private static Logger log = Logger.getLogger(WorkflowInvoker.class);
public static final String ROLES = "roles";
public static final String USER_ID = "user-id";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/IndexConfiguration.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/IndexConfiguration.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/IndexConfiguration.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/IndexConfiguration.java Sat Apr 29 14:30:03 2006
@@ -24,13 +24,12 @@
import org.apache.lenya.xml.DOMUtil;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.XPath;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
public class IndexConfiguration {
- static Category log = Category.getInstance(IndexConfiguration.class);
+ static Logger log = Logger.getLogger(IndexConfiguration.class);
private String configurationFilePath;
private String update_index_type;
private String index_dir;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/ReTokenizeFile.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/ReTokenizeFile.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/ReTokenizeFile.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/ReTokenizeFile.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ReTokenizeFile.java,v 1.22 2004/07/12 10:21:37 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene;
@@ -30,7 +30,7 @@
import java.util.StringTokenizer;
import org.apache.lenya.lucene.html.HTMLParser;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -40,7 +40,7 @@
* DOCUMENT ME!
*/
public class ReTokenizeFile {
- private static final Category log = Category.getInstance(ReTokenizeFile.class);
+ private static final Logger log = Logger.getLogger(ReTokenizeFile.class);
private int offset = 100;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractDocumentCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractDocumentCreator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractDocumentCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractDocumentCreator.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: AbstractDocumentCreator.java,v 1.11 2004/08/02 00:19:42 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene.index;
@@ -25,10 +25,10 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
public class AbstractDocumentCreator implements DocumentCreator {
- Category log = Category.getInstance(AbstractDocumentCreator.class);
+ Logger log = Logger.getLogger(AbstractDocumentCreator.class);
/** Creates a new instance of AbstractDocumentCreator */
public AbstractDocumentCreator() {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractIndexer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractIndexer.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractIndexer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/AbstractIndexer.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: AbstractIndexer.java,v 1.22 2004/08/02 06:28:44 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene.index;
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.util.Arrays;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lenya.lucene.IndexConfiguration;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
@@ -40,7 +40,7 @@
* DocumentCreator from the command-line arguments.
*/
public abstract class AbstractIndexer implements Indexer {
- private static Category log = Category.getInstance(AbstractIndexer.class);
+ private static Logger log = Logger.getLogger(AbstractIndexer.class);
private DocumentCreator documentCreator;
private Element indexer;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableDocumentCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableDocumentCreator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableDocumentCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableDocumentCreator.java Sat Apr 29 14:30:03 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ConfigurableDocumentCreator.java,v 1.11 2004/05/16 23:23:13 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene.index;
@@ -42,7 +42,7 @@
import org.apache.lenya.lucene.parser.StringCleaner;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.w3c.dom.Element;
@@ -54,7 +54,7 @@
* Uses XSLT to transform a XML into a Lucene document
*/
public class ConfigurableDocumentCreator extends AbstractDocumentCreator {
- Category log = Category.getInstance(ConfigurableDocumentCreator.class);
+ Logger log = Logger.getLogger(ConfigurableDocumentCreator.class);
public static final String LUCENE_NAMESPACE = "http://apache.org/cocoon/lenya/lucene/1.0";
public static final String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableIndexer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableIndexer.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableIndexer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/ConfigurableIndexer.java Sat Apr 29 14:30:03 2006
@@ -34,14 +34,14 @@
import org.apache.cocoon.util.NetUtils;
import org.apache.lenya.xml.DocumentHelper;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class ConfigurableIndexer extends AbstractIndexer {
- Category log = Category.getInstance(ConfigurableIndexer.class);
+ Logger log = Logger.getLogger(ConfigurableIndexer.class);
/**
* Instantiate a Document Creator for creating Lucene Documents
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexInformation.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexInformation.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexInformation.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexInformation.java Sat Apr 29 14:30:03 2006
@@ -27,7 +27,7 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -36,7 +36,7 @@
*/
public class IndexInformation {
- private static Category log = Category.getInstance(IndexInformation.class);
+ private static Logger log = Logger.getLogger(IndexInformation.class);
/**
* Creates a new IndexInformation object.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java?rev=398238&r1=398237&r2=398238&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java Sat Apr 29 14:30:03 2006
@@ -33,7 +33,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.lucene.document.DateField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -41,7 +41,7 @@
public class IndexIterator {
- private static Category log = Category.getInstance(IndexIterator.class);
+ private static Logger log = Logger.getLogger(IndexIterator.class);
/**
* Creates a new instance of IndexItertor
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org