svn commit: r740993 - in /lenya/trunk: org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/ org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/ org.apache.lenya.core....
[email protected] Thu, 05 Feb 2009 03:59:34 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: froethenbacher
Date: Thu Feb 5 03:59:31 2009
New Revision: 740993
URL: http://svn.apache.org/viewvc?rev=740993&view=rev
Log:
[MIGRATION] Removed dependency on AbstractLogEnabled and Avalon Logger.
Modified:
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/CIFSUser.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/search/Grep.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
lenya/trunk/org.apache.lenya.module.navigation/pom.xml
lenya/trunk/org.apache.lenya.module.news/pom.xml
lenya/trunk/org.apache.lenya.module.news/src/main/java/org/apache/lenya/modules/news/NewsWrapper.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxManager.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java
lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java
lenya/trunk/org.apache.lenya.module.resource/pom.xml
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java
lenya/trunk/org.apache.lenya.module.simplesite/pom.xml
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java
lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/RootNode.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java
lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
lenya/trunk/org.apache.lenya.module.svg/pom.xml
lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java
lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml
lenya/trunk/org.apache.lenya.module.webdav/pom.xml
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
lenya/trunk/org.apache.lenya.parent/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/CIFSUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/CIFSUser.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/CIFSUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/cifs/CIFSUser.java Thu Feb 5 03:59:31 2009
@@ -27,7 +27,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import jcifs.smb.NtlmPasswordAuthentication;
import jcifs.smb.SmbAuthException;
@@ -61,7 +61,7 @@
* @param itemManager The item manager.
* @param logger The logger.
*/
- public CIFSUser(ItemManager itemManager, Logger logger) {
+ public CIFSUser(ItemManager itemManager, Log logger) {
super(itemManager, logger);
}
@@ -75,7 +75,7 @@
* @param email The e-mail address.
* @param password The password.
*/
- public CIFSUser(ItemManager itemManager, Logger logger, String id, String fullName,
+ public CIFSUser(ItemManager itemManager, Log logger, String id, String fullName,
String email, String password) {
super(itemManager, logger, id, fullName, email, password);
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java Thu Feb 5 03:59:31 2009
@@ -27,9 +27,9 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.util.NetUtils;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.ac.AccessControlException;
@@ -55,7 +55,7 @@
* @param configurationUri The configuration directory URI.
* @param _userTypes The supported user types.
*/
- public FileAccreditableManager(ServiceManager manager, Logger logger,
+ public FileAccreditableManager(ServiceManager manager, Log logger,
String configurationUri, UserType[] _userTypes) {
super(logger);
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java Thu Feb 5 03:59:31 2009
@@ -26,7 +26,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.ItemManager;
@@ -51,7 +51,7 @@
* @param itemManager The item manager.
* @param logger The logger.
*/
- public FileGroup(ItemManager itemManager, Logger logger) {
+ public FileGroup(ItemManager itemManager, Log logger) {
super(itemManager, logger);
}
@@ -61,7 +61,7 @@
* @param logger The logger.
* @param id the ID of the group
*/
- public FileGroup(ItemManager itemManager, Logger logger, String id) {
+ public FileGroup(ItemManager itemManager, Log logger, String id) {
super(itemManager, logger, id);
FileItemManager fileItemManager = (FileItemManager) itemManager;
setConfigurationDirectory(fileItemManager.getConfigurationDirectory());
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java Thu Feb 5 03:59:31 2009
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
import org.apache.lenya.ac.Group;
@@ -56,12 +56,11 @@
* @throws AccessControlException if no GroupManager could be instanciated
*/
public static FileGroupManager instance(AccreditableManager mgr, File configurationDirectory,
- Logger logger) throws AccessControlException {
+ Log logger) throws AccessControlException {
assert configurationDirectory != null;
if (!instances.containsKey(configurationDirectory)) {
FileGroupManager manager = new FileGroupManager(mgr);
- manager.enableLogging(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java Thu Feb 5 03:59:31 2009
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
import org.apache.lenya.ac.IPRange;
@@ -63,7 +63,7 @@
* @return an <code>IPRangeManager</code> value
* @exception AccessControlException if an error occurs
*/
- public static FileIPRangeManager instance(AccreditableManager mgr, File configurationDirectory, Logger logger)
+ public static FileIPRangeManager instance(AccreditableManager mgr, File configurationDirectory, Log logger)
throws AccessControlException {
assert configurationDirectory != null;
@@ -74,7 +74,6 @@
if (!instances.containsKey(configurationDirectory)) {
FileIPRangeManager manager = new FileIPRangeManager(mgr);
- manager.enableLogging(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java Thu Feb 5 03:59:31 2009
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
import org.apache.lenya.ac.Item;
@@ -54,11 +54,10 @@
* @return A role manager.
* @throws AccessControlException when something went wrong.
*/
- public static FileRoleManager instance(AccreditableManager mgr, File configurationDirectory, Logger logger)
+ public static FileRoleManager instance(AccreditableManager mgr, File configurationDirectory, Log logger)
throws AccessControlException {
if (!instances.containsKey(configurationDirectory)) {
FileRoleManager manager = new FileRoleManager(mgr);
- manager.enableLogging(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java Thu Feb 5 03:59:31 2009
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
import org.apache.lenya.ac.Item;
@@ -65,7 +65,7 @@
* @return an <code>UserManager</code> value
* @exception AccessControlException if an error occurs
*/
- public static FileUserManager instance(AccreditableManager mgr, File configurationDirectory, UserType[] userTypes, Logger logger)
+ public static FileUserManager instance(AccreditableManager mgr, File configurationDirectory, UserType[] userTypes, Log logger)
throws AccessControlException {
assert configurationDirectory != null;
@@ -76,7 +76,6 @@
if (!instances.containsKey(configurationDirectory)) {
FileUserManager manager = new FileUserManager(mgr, userTypes);
- manager.enableLogging(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java Thu Feb 5 03:59:31 2009
@@ -28,7 +28,6 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.logging.Log;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java Thu Feb 5 03:59:31 2009
@@ -23,7 +23,6 @@
import java.util.Enumeration;
import java.util.List;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
@@ -118,7 +117,7 @@
* @throws AccessControlException if an error occurs.
*/
public static final User[] getUsersWithRole(ServiceManager manager, String webappUrl,
- String role, Logger logger) throws AccessControlException {
+ String role, Log logger) throws AccessControlException {
ServiceSelector selector = null;
AccessControllerResolver resolver = null;
AccessController controller = null;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java Thu Feb 5 03:59:31 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.observation;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentFactory;
@@ -41,7 +41,7 @@
* @return An event.
*/
public static final RepositoryEvent createEvent(ServiceManager manager,
- Session session, Logger logger, Object descriptor) {
+ Session session, Log logger, Object descriptor) {
return new RepositoryEvent(session, descriptor);
}
@@ -54,7 +54,7 @@
* @return An event.
*/
public static final RepositoryEvent createEvent(ServiceManager manager, Document doc,
- Logger logger, Object descriptor) {
+ Log logger, Object descriptor) {
try {
Node node = doc.getRepositoryNode();
RepositoryEvent event = new DocumentEvent(node.getSession(), doc.getPublication()
@@ -81,7 +81,7 @@
* @return An event.
*/
public static final RepositoryEvent createEvent(ServiceManager manager, Node node,
- Logger logger, Object descriptor) {
+ Log logger, Object descriptor) {
RepositoryEvent event;
Document doc = null;
if (!node.getSourceURI().endsWith("meta")) {
@@ -103,7 +103,7 @@
* @return The document represented by the node or <code>null</code> if
* the node doesn't represent a document.
*/
- protected static final Document getDocument(ServiceManager manager, Node node, Logger logger) {
+ protected static final Document getDocument(ServiceManager manager, Node node, Log logger) {
final String sourceUri = node.getSourceURI();
if (sourceUri.endsWith(".xml")) {
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java Thu Feb 5 03:59:31 2009
@@ -29,7 +29,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.logging.Log;
import org.xml.sax.SAXException;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java Thu Feb 5 03:59:31 2009
@@ -62,8 +62,6 @@
*/
public SessionImpl(Identity identity, boolean modifiable, ServiceManager manager, Log logger) {
- ContainerUtil.enableLogging(this, logger);
-
Assert.notNull("service manager", manager);
this.manager = manager;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/search/Grep.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/search/Grep.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/search/Grep.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/search/Grep.java Thu Feb 5 03:59:31 2009
@@ -36,12 +36,14 @@
import java.util.regex.Pattern;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Utility class to provide a subset of the grep functionality.
*/
public class Grep {
+ private static final Log logger = LogFactory.getLog(Grep.class);
private static Charset charset = Charset.forName("UTF-8");
private static CharsetDecoder decoder = charset.newDecoder();
@@ -55,8 +57,6 @@
*/
public static boolean containsPattern(File file, Pattern pattern) throws IOException {
- Logger log = new ConsoleLogger();
-
FileChannel fc = null;
// Open the file and then get a channel from the stream
FileInputStream fis = null;
@@ -78,11 +78,11 @@
result = pm.find();
} catch (FileNotFoundException e) {
- log.error("File not found: " +e.toString());
+ logger.error("File not found: " +e.toString());
} catch (CharacterCodingException e) {
- log.error("Problem with encoding: " +e.toString());
+ logger.error("Problem with encoding: " +e.toString());
} catch (IOException e) {
- log.error("IO Exception: " +e.toString());
+ logger.error("IO Exception: " +e.toString());
} finally {
// Close the channel and the stream
if (fc != null)
@@ -104,8 +104,6 @@
*/
public static String[] findPattern(File file, Pattern pattern, int group) throws IOException {
- Logger log = new ConsoleLogger();
-
ArrayList occurences = new ArrayList();
FileInputStream fis = null;
FileChannel fc = null;
@@ -129,11 +127,11 @@
occurences.add(pm.group(group));
}
} catch (FileNotFoundException e) {
- log.error("file not found " +e.toString());
+ logger.error("file not found " +e.toString());
} catch (CharacterCodingException e) {
- log.error("encoding problem " +e.toString());
+ logger.error("encoding problem " +e.toString());
} catch (IOException e) {
- log.error("IO exception" +e.toString());
+ logger.error("IO exception" +e.toString());
} finally {
// Close the channel and the stream
if (fc != null)
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java Thu Feb 5 03:59:31 2009
@@ -21,10 +21,10 @@
import java.util.StringTokenizer;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
@@ -54,10 +54,9 @@
* @param manager The service manager.
* @param logger The logger to use.
*/
- public DocumentFactoryImpl(Session session, ServiceManager manager, Logger logger) {
+ public DocumentFactoryImpl(Session session, ServiceManager manager, Log logger) {
this.session = session;
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
}
/**
@@ -284,7 +283,6 @@
int revision, DocumentBuilder builder) throws DocumentBuildException {
DocumentImpl document = createDocument(map, identifier, revision, builder);
- ContainerUtil.enableLogging(document, getLogger());
return document;
}
Modified: lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java (original)
+++ lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java Thu Feb 5 03:59:31 2009
@@ -17,8 +17,6 @@
*/
package org.apache.lenya.cms.export;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.excalibur.source.SourceResolver;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java Thu Feb 5 03:59:31 2009
@@ -20,8 +20,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.components.search.components.AnalyzerManager;
import org.apache.cocoon.components.search.utils.SourceHelper;
import org.apache.excalibur.source.Source;
@@ -33,18 +31,13 @@
*
* @author Nicolas Maisonneuve
*/
-public abstract class ConfigurableAnalyzer extends Analyzer implements
- LogEnabled {
-
+public abstract class ConfigurableAnalyzer extends Analyzer implements {
+ private static final Log logger = LogFactory.getLog(ConfigurableAnalyzer.class);
/**
* the lucene analyzer
*/
protected Analyzer analyzer;
- /**
- * a logger
- */
- protected Logger logger;
/**
* the analyzer manager component
@@ -80,15 +73,6 @@
return analyzer.tokenStream(fieldName, reader);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
- */
- public void enableLogging(Logger log) {
- logger = log;
- }
-
/**
* Enable the check of the config file (to update the analyzer if the config
* file changes) when the method
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java Thu Feb 5 03:59:31 2009
@@ -19,7 +19,6 @@
import java.io.IOException;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.search.IndexException;
import org.apache.cocoon.components.search.components.Indexer;
import org.apache.lucene.analysis.Analyzer;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java Thu Feb 5 03:59:31 2009
@@ -22,7 +22,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.search.components.Searcher;
import org.apache.lucene.search.Hits;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java Thu Feb 5 03:59:31 2009
@@ -22,8 +22,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java Thu Feb 5 03:59:31 2009
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java Thu Feb 5 03:59:31 2009
@@ -20,7 +20,6 @@
import java.util.Arrays;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java Thu Feb 5 03:59:31 2009
@@ -21,7 +21,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.navigation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.navigation/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.navigation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.navigation/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,13 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Navigation</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-linking</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.news/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.news/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.news/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.news/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,17 @@
<packaging>jar</packaging>
<name>Apache Lenya Module News</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-collection</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.news/src/main/java/org/apache/lenya/modules/news/NewsWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.news/src/main/java/org/apache/lenya/modules/news/NewsWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.news/src/main/java/org/apache/lenya/modules/news/NewsWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.news/src/main/java/org/apache/lenya/modules/news/NewsWrapper.java Thu Feb 5 03:59:31 2009
@@ -19,7 +19,7 @@
import javax.xml.transform.TransformerException;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.modules.collection.CollectionWrapper;
@@ -40,7 +40,7 @@
* @param doc The document to wrap.
* @param logger The logger.
*/
- public NewsWrapper(Document doc, Logger logger) {
+ public NewsWrapper(Document doc, Log logger) {
super(doc, logger);
}
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxManager.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxManager.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxManager.java Thu Feb 5 03:59:31 2009
@@ -20,8 +20,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.User;
/**
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java Thu Feb 5 03:59:31 2009
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java Thu Feb 5 03:59:31 2009
@@ -21,8 +21,6 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
Modified: lenya/trunk/org.apache.lenya.module.resource/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.resource/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.resource/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.resource/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,25 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Resource</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-sitemanagement</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>${pdfbox.version}</version>
+ </dependency>
</dependencies>
+ <properties>
+ <pdfbox.version>0.7.3</pdfbox.version>
+ </properties>
</project>
Modified: lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java Thu Feb 5 03:59:31 2009
@@ -27,13 +27,13 @@
import javax.imageio.ImageIO;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.servlet.multipart.Part;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.TraversableSource;
import org.apache.lenya.cms.metadata.MetaData;
@@ -57,10 +57,9 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public ResourceWrapper(Document document, ServiceManager manager, Logger logger) {
+ public ResourceWrapper(Document document, ServiceManager manager, Log logger) {
this.document = document;
this.manager = manager;
- enableLogging(logger);
}
protected Document getDocument() {
Modified: lenya/trunk/org.apache.lenya.module.simplesite/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,18 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Simple Site</name>
<dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-collection</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java Thu Feb 5 03:59:31 2009
@@ -26,7 +26,7 @@
import java.util.Set;
import java.util.WeakHashMap;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentException;
@@ -62,7 +62,7 @@
* @param logger The logger.
* @throws DocumentException if an error occurs.
*/
- public DocumentStore(Document doc, Logger logger) throws DocumentException {
+ public DocumentStore(Document doc, Log logger) throws DocumentException {
super(doc, logger);
this.doc2path.put(getKey(doc.getUUID(), doc.getLanguage()), SITE_PATH);
}
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java Thu Feb 5 03:59:31 2009
@@ -18,10 +18,10 @@
package org.apache.lenya.cms.site.simple;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentFactory;
@@ -49,9 +49,8 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public DocumentStoreFactory(ServiceManager manager, Logger logger) {
+ public DocumentStoreFactory(ServiceManager manager, Log logger) {
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
}
/**
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java Thu Feb 5 03:59:31 2009
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.site.AbstractSiteNode;
@@ -33,7 +33,7 @@
*/
public class SimpleSiteNode extends AbstractSiteNode {
- protected SimpleSiteNode(DocumentStore store, String path, String uuid, Logger logger) {
+ protected SimpleSiteNode(DocumentStore store, String path, String uuid, Log logger) {
super(store.getPublication(), store, path, uuid, logger);
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,9 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Sitetree</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Thu Feb 5 03:59:31 2009
@@ -26,8 +26,6 @@
import javax.xml.transform.TransformerException;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java Thu Feb 5 03:59:31 2009
@@ -18,8 +18,6 @@
package org.apache.lenya.cms.site.tree;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java Thu Feb 5 03:59:31 2009
@@ -22,8 +22,6 @@
import java.util.List;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.site.Link;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/RootNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/RootNode.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/RootNode.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/RootNode.java Thu Feb 5 03:59:31 2009
@@ -21,7 +21,7 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.site.SiteNode;
/**
@@ -35,7 +35,7 @@
* @param tree The tree.
* @param logger The logger.
*/
- public RootNode(SiteTreeImpl tree, Logger logger) {
+ public RootNode(SiteTreeImpl tree, Log logger) {
super(null, "", false, logger);
this.tree = tree;
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java Thu Feb 5 03:59:31 2009
@@ -1,6 +1,5 @@
package org.apache.lenya.cms.site.tree2;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java Thu Feb 5 03:59:31 2009
@@ -19,7 +19,6 @@
import java.io.OutputStream;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java Thu Feb 5 03:59:31 2009
@@ -18,8 +18,6 @@
package org.apache.lenya.cms.site.tree2;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.DocumentFactory;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java Thu Feb 5 03:59:31 2009
@@ -22,8 +22,6 @@
import java.util.Set;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.lenya.cms.publication.Area;
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java Thu Feb 5 03:59:31 2009
@@ -24,9 +24,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
@@ -52,8 +51,7 @@
* @param visible The navigation visibility.
* @param logger The logger.
*/
- public TreeNodeImpl(TreeNode parent, String name, boolean visible, Logger logger) {
- ContainerUtil.enableLogging(this, logger);
+ public TreeNodeImpl(TreeNode parent, String name, boolean visible, Log logger) {
Assert.notNull("name", name);
this.name = name;
this.parent = parent;
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,9 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Source Repository</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java Thu Feb 5 03:59:31 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.repository;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
/**
* Content source wrapper.
@@ -32,7 +32,7 @@
* @param manager
* @param logger
*/
- public ContentSourceWrapper(SourceNode node, String sourceURI, ServiceManager manager, Logger logger) {
+ public ContentSourceWrapper(SourceNode node, String sourceURI, ServiceManager manager, Log logger) {
super(node, sourceURI, manager, logger);
}
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java Thu Feb 5 03:59:31 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.repository;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.cms.metadata.MetaDataOwner;
@@ -38,7 +38,7 @@
* @param logger
*/
public MetaSourceWrapper(SourceNode node, String sourceURI, ServiceManager manager,
- Logger logger) {
+ Log logger) {
super(node, sourceURI + "." + LENYA_META_SUFFIX, manager, logger);
this.handler = new ModifiableMetaDataHandler(manager, this);
}
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java Thu Feb 5 03:59:31 2009
@@ -21,10 +21,10 @@
import java.io.OutputStream;
import java.util.Collection;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.TraversableSource;
import org.apache.lenya.ac.Identity;
@@ -63,9 +63,8 @@
* @param manager
* @param logger
*/
- public SourceNode(Session session, String sourceUri, ServiceManager manager, Logger logger) {
+ public SourceNode(Session session, String sourceUri, ServiceManager manager, Log logger) {
this.manager = manager;
- enableLogging(logger);
this.session = session;
this.contentSource = new ContentSourceWrapper(this, sourceUri, manager, logger);
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java Thu Feb 5 03:59:31 2009
@@ -17,11 +17,11 @@
*/
package org.apache.lenya.cms.repository;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* Factory to create source nodes.
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java Thu Feb 5 03:59:31 2009
@@ -20,9 +20,9 @@
import java.util.Vector;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.rc.CheckInEntry;
import org.apache.lenya.cms.rc.RCML;
@@ -40,10 +40,9 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public SourceNodeHistory(SourceNode node, ServiceManager manager, Logger logger) {
+ public SourceNodeHistory(SourceNode node, ServiceManager manager, Log logger) {
this.node = node;
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
}
public Revision getLatestRevision() {
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java Thu Feb 5 03:59:31 2009
@@ -21,8 +21,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.metadata.Element;
import org.apache.lenya.cms.metadata.ElementSet;
import org.apache.lenya.cms.metadata.MetaData;
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java Thu Feb 5 03:59:31 2009
@@ -21,10 +21,9 @@
import java.util.Iterator;
import java.util.Vector;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
@@ -51,11 +50,10 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public SourceNodeRevision(SourceNode node, int number, ServiceManager manager, Logger logger) {
+ public SourceNodeRevision(SourceNode node, int number, ServiceManager manager, Log logger) {
this.node = node;
this.number = number;
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
}
public long getTime() {
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java Thu Feb 5 03:59:31 2009
@@ -27,10 +27,10 @@
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.TraversableSource;
@@ -56,7 +56,7 @@
* @param manager
* @param logger
*/
- public SourceWrapper(SourceNode node, String sourceUri, ServiceManager manager, Logger logger) {
+ public SourceWrapper(SourceNode node, String sourceUri, ServiceManager manager, Log logger) {
Assert.notNull("node", node);
this.node = node;
@@ -67,7 +67,6 @@
Assert.notNull("service manager", manager);
this.manager = manager;
- enableLogging(logger);
}
protected static final String FILE_PREFIX = "file:/";
@@ -93,7 +92,7 @@
}
protected static final String computeRealSourceUri(ServiceManager manager, Session session,
- String sourceUri, Logger logger) {
+ String sourceUri, Log logger) {
String contentDir = null;
String publicationId = null;
try {
Modified: lenya/trunk/org.apache.lenya.module.svg/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.svg/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,9 @@
<packaging>jar</packaging>
<name>Apache Lenya Module SVG</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java (original)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java Thu Feb 5 03:59:31 2009
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
Modified: lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,13 @@
<packaging>jar</packaging>
<name>Apache Lenya Module Usecase Document</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-sitemanagement</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.webdav/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/pom.xml Thu Feb 5 03:59:31 2009
@@ -15,5 +15,18 @@
<packaging>jar</packaging>
<name>Apache Lenya Module WebDAV</name>
<dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-sitemanagement</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java Thu Feb 5 03:59:31 2009
@@ -17,7 +17,6 @@
*/
package org.apache.lenya.cms.jcr;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java Thu Feb 5 03:59:31 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.cms.jcr;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.repository.SourceNode;
@@ -37,7 +37,7 @@
* @param manager The service manager.
* @param logger The logger.
*/
- public JCRSourceNode(Session session, String sourceURI, ServiceManager manager, Logger logger) {
+ public JCRSourceNode(Session session, String sourceURI, ServiceManager manager, Log logger) {
super(session, sourceURI, manager, logger);
this.sourceUri = sourceURI;
}
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java Thu Feb 5 03:59:31 2009
@@ -29,8 +29,6 @@
import javax.jcr.Value;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.jcr.source.JCRNodeSource;
import org.apache.excalibur.source.SourceResolver;
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=740993&r1=740992&r2=740993&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Thu Feb 5 03:59:31 2009
@@ -150,6 +150,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-sitemanagement</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
<version>${project.version}</version>
</dependency>
@@ -165,6 +170,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-collection</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-notification</artifactId>
<version>${project.version}</version>
</dependency>