svn commit: r740982 [2/3] - in /lenya/trunk: ./ org.apache.lenya.core.ac/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ org.apache.lenya.core.ac/src/main/java/org/apach...

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilderImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilderImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilderImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilderImpl.java Thu Feb  5 03:00:06 2009
@@ -17,11 +17,11 @@
  */
 package org.apache.lenya.cms.publication;
 
-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;
 import org.apache.lenya.cms.repository.Session;
 
 /**

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=740982&r1=740981&r2=740982&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:00:06 2009
@@ -21,10 +21,10 @@
 import java.util.StringTokenizer;
 
 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.lenya.cms.repository.RepositoryException;
 import org.apache.lenya.cms.repository.RepositoryItem;
 import org.apache.lenya.cms.repository.Session;

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java Thu Feb  5 03:00:06 2009
@@ -26,11 +26,11 @@
 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.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.cms.cocoon.source.SourceUtil;
 import org.apache.lenya.cms.metadata.MetaData;
 import org.apache.lenya.cms.metadata.MetaDataCache;
@@ -98,9 +98,8 @@
      * @param _logger a logger
      */
     protected DocumentImpl(ServiceManager manager, DocumentFactory map,
-            DocumentIdentifier identifier, int revision, Logger _logger) {
+            DocumentIdentifier identifier, int revision, Log logger) {
 
-        ContainerUtil.enableLogging(this, _logger);
         if (getLogger().isDebugEnabled()) {
             getLogger().debug(
                     "DefaultDocument() creating new instance with id [" + identifier.getUUID()

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -33,11 +33,11 @@
 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.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.excalibur.source.Source;

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java Thu Feb  5 03:00:06 2009
@@ -30,7 +30,7 @@
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.repository.Node;
 import org.apache.lenya.cms.repository.Session;
 import org.apache.lenya.util.Assert;

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java Thu Feb  5 03:00:06 2009
@@ -25,10 +25,10 @@
 import java.util.List;
 import java.util.Map;
 
-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.ServiceSelector;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
 import org.apache.lenya.cms.repository.Session;
 

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -31,11 +31,11 @@
 
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.container.ContainerUtil;
-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;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.excalibur.source.SourceUtil;
@@ -158,7 +158,6 @@
             context = (ContextUtility) this.manager.lookup(ContextUtility.ROLE);
             PublicationConfiguration config = new PublicationConfiguration(pubId,
                     this.servletContextPath, context.getRequest().getContextPath());
-            ContainerUtil.enableLogging(config, getLogger());
             id2config.put(pubId, config);
         } catch (ServiceException e) {
             throw new PublicationException(e);

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java Thu Feb  5 03:00:06 2009
@@ -29,11 +29,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.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;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.lenya.util.Assert;

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java Thu Feb  5 03:00:06 2009
@@ -17,10 +17,10 @@
  */
 package org.apache.lenya.cms.repository;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.axis.components.uuid.UUIDGen;
 import org.apache.axis.components.uuid.UUIDGenFactory;
+import org.apache.cocoon.util.AbstractLogEnabled;
 
 /**
  * UUID generator based on Apache Axis.

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java Thu Feb  5 03:00:06 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;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.cms.observation.RepositoryEvent;
 import org.apache.lenya.cms.observation.RepositoryListener;

Modified: lenya/trunk/org.apache.lenya.core.janitor/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.janitor/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.janitor/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.janitor/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-janitor</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.ldap/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ldap/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ldap/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.ldap/pom.xml Thu Feb  5 03:00:06 2009
@@ -5,8 +5,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-ldap</artifactId>
@@ -18,10 +19,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.ldap/src/main/java/org/apache/lenya/ac/ldap/LDAPUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ldap/src/main/java/org/apache/lenya/ac/ldap/LDAPUser.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ldap/src/main/java/org/apache/lenya/ac/ldap/LDAPUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ldap/src/main/java/org/apache/lenya/ac/ldap/LDAPUser.java Thu Feb  5 03:00:06 2009
@@ -38,7 +38,7 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.ItemManager;
 import org.apache.lenya.ac.file.FileUser;
@@ -93,7 +93,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public LDAPUser(ItemManager itemManager, Logger logger) {
+    public LDAPUser(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 
@@ -107,8 +107,8 @@
      * @param _logger The logger.
      * @throws ConfigurationException if the properties could not be read
      */
-    public LDAPUser(ItemManager itemManager, Logger logger, String id, String email,
-            String _ldapId, Logger _logger) throws ConfigurationException {
+    public LDAPUser(ItemManager itemManager, Log logger, String id, String email,
+            String _ldapId, Log _logger) throws ConfigurationException {
         super(itemManager, logger, id, null, email, null);
         this.ldapId = _ldapId;
         initialize();

Modified: lenya/trunk/org.apache.lenya.core.linking/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.linking/pom.xml Thu Feb  5 03:00:06 2009
@@ -5,8 +5,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-linking</artifactId>
@@ -23,10 +24,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java Thu Feb  5 03:00:06 2009
@@ -27,7 +27,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;
@@ -35,6 +34,7 @@
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceFactory;

Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ContentLinkManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ContentLinkManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ContentLinkManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ContentLinkManager.java Thu Feb  5 03:00:06 2009
@@ -20,10 +20,10 @@
 import java.util.HashSet;
 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;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.xml.DocumentHelper;
 import org.apache.xpath.XPathAPI;

Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java Thu Feb  5 03:00:06 2009
@@ -18,10 +18,10 @@
 package org.apache.lenya.cms.linking;
 
 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.cocoon.components.context.ContextUtility;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.cms.publication.Publication;
@@ -45,8 +45,7 @@
      * @param manager The service manager.
      * @param logger The logger.
      */
-    public LinkConverter(ServiceManager manager, Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public LinkConverter(ServiceManager manager, Log logger) {
         this.manager = manager;
     }
 

Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java Thu Feb  5 03:00:06 2009
@@ -22,7 +22,7 @@
 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.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.publication.Area;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.cms.publication.DocumentFactory;

Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/impl/GlobalProxiesImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/impl/GlobalProxiesImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/impl/GlobalProxiesImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/impl/GlobalProxiesImpl.java Thu Feb  5 03:00:06 2009
@@ -23,11 +23,11 @@
 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;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
 import org.apache.lenya.cms.linking.GlobalProxies;
 import org.apache.lenya.cms.publication.Proxy;

Modified: lenya/trunk/org.apache.lenya.core.metadata/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.metadata/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-metadata</artifactId>
@@ -19,10 +20,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.monitoring/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.monitoring/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.monitoring/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.monitoring/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-monitoring</artifactId>
@@ -24,10 +25,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.observation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.observation/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-observation</artifactId>
@@ -19,10 +20,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java Thu Feb  5 03:00:06 2009
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.cms.publication.DocumentIdentifier;
 import org.apache.lenya.util.Assert;

Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java Thu Feb  5 03:00:06 2009
@@ -18,11 +18,11 @@
 package org.apache.lenya.cms.observation;
 
 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;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
 
 /**
  * Write repository events to the log.

Modified: lenya/trunk/org.apache.lenya.core.properties/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.properties/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.properties/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.properties/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-properties</artifactId>
@@ -19,10 +20,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-sitemanagement</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.templating/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.templating/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.templating/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.templating/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-templating</artifactId>
@@ -19,10 +20,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -22,12 +22,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-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.avalon.framework.service.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.publication.PublicationException;
@@ -212,7 +212,7 @@
          * @param hint The hint to check.
          * @param logger The logger.
          */
-        public ExistingServiceVisitor(ServiceSelector selector, Object hint, Logger logger) {
+        public ExistingServiceVisitor(ServiceSelector selector, Object hint, Log logger) {
             this.selector = selector;
             this.hint = hint;
             this.logger = logger;
@@ -221,7 +221,7 @@
         private ServiceSelector selector;
         private Object hint;
         private Object selectableHint = null;
-        private Logger logger;
+        private Log logger;
 
         /**
          * @see org.apache.lenya.cms.publication.templating.PublicationVisitor#visit(org.apache.lenya.cms.publication.Publication)

Modified: lenya/trunk/org.apache.lenya.core.usecase/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-usecase</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java Thu Feb  5 03:00:06 2009
@@ -22,7 +22,6 @@
 import java.util.List;
 
 import org.apache.avalon.framework.activity.Disposable;
-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;
@@ -30,6 +29,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.Role;
 import org.apache.lenya.ac.cache.BuildException;

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/matching/UsecaseRegistrationMatcher.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/matching/UsecaseRegistrationMatcher.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/matching/UsecaseRegistrationMatcher.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/matching/UsecaseRegistrationMatcher.java Thu Feb  5 03:00:06 2009
@@ -24,7 +24,6 @@
 import java.util.Map;
 
 import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -33,6 +32,7 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.matching.Matcher;
 import org.apache.cocoon.sitemap.PatternException;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.usecase.UsecaseResolver;
 import org.apache.lenya.util.ServletHelper;
 

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Thu Feb  5 03:00:06 2009
@@ -32,13 +32,12 @@
 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;
-import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.servlet.multipart.Part;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.publication.DocumentFactory;
 import org.apache.lenya.cms.publication.DocumentUtil;
 import org.apache.lenya.cms.repository.Node;

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -28,13 +28,13 @@
 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.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccessController;
 import org.apache.lenya.ac.AccessControllerResolver;

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java Thu Feb  5 03:00:06 2009
@@ -23,12 +23,12 @@
 import java.util.List;
 import java.util.Map;
 
-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.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessController;
 import org.apache.lenya.ac.AccessControllerResolver;
 import org.apache.lenya.ac.Authorizer;

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java Thu Feb  5 03:00:06 2009
@@ -21,13 +21,13 @@
 import java.util.TreeSet;
 
 import org.apache.avalon.framework.activity.Disposable;
-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.ServiceSelector;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
 import org.apache.lenya.cms.publication.DocumentFactory;
 import org.apache.lenya.cms.publication.DocumentUtil;

Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Thu Feb  5 03:00:06 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.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -36,6 +35,7 @@
 import org.apache.cocoon.components.cron.JobSchedulerEntry;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.Machine;
 import org.apache.lenya.ac.User;

Modified: lenya/trunk/org.apache.lenya.core.workflow/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/pom.xml Thu Feb  5 03:00:06 2009
@@ -6,8 +6,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.lenya</groupId>
-    <artifactId>lenya</artifactId>
+    <artifactId>lenya-parent</artifactId>
     <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lenya</groupId>
   <artifactId>lenya-core-workflow</artifactId>
@@ -19,10 +20,6 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java Thu Feb  5 03:00:06 2009
@@ -30,7 +30,6 @@
  * @version $Id$
  */
 public class History extends DocumentUsecase {
-	private static final Log logger = LogFactory.getLog(History.class);
 
     /**
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters() TODO
@@ -41,7 +40,7 @@
 
         if (getSourceDocument() != null) {
             Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
-                    logger, getSourceDocument());
+                    getLogger(), getSourceDocument());
             Version[] versions = workflowable.getVersions();
             setParameter("versions", versions);
         }

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java Thu Feb  5 03:00:06 2009
@@ -17,8 +17,8 @@
  */
 package org.apache.lenya.cms.workflow.usecases;
 
-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.MetaDataException;
 import org.apache.lenya.cms.metadata.dublincore.DublinCoreHelper;
 import org.apache.lenya.cms.publication.Document;
@@ -65,7 +65,7 @@
      * @param logger The logger.
      */
     public static final void checkWorkflow(ServiceManager manager, AbstractUsecase usecase,
-            String event, Document doc, Logger logger) {
+            String event, Document doc, Log logger) {
         try {
             if (!WorkflowUtil.canInvoke(manager, usecase.getSession(), logger, doc, event)) {
                 UsecaseWorkflowHelper.addWorkflowError(usecase, event, doc);

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java Thu Feb  5 03:00:06 2009
@@ -20,9 +20,8 @@
 import java.util.Arrays;
 
 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.commons.logging.LogFactory;
 import org.apache.lenya.cms.publication.Document;
@@ -37,7 +36,6 @@
  * Wrap a workflowable for easy evaluation in JX template.
  */
 public class WorkflowableWrapper extends AbstractLogEnabled {
-	private static final Log logger = LogFactory.getLog(WorkflowableWrapper.class);
 	
     private MultiWorkflow usecase;
     private Workflowable workflowable;
@@ -54,18 +52,17 @@
      * @param logger The logger.
      */
     public WorkflowableWrapper(MultiWorkflow usecase, ServiceManager manager, Session session,
-            Document document, Logger logger) {
+            Document document, Log logger) {
         this.usecase = usecase;
         this.document = document;
         this.manager = manager;
         this.session = session;
-        ContainerUtil.enableLogging(this, logger);
     }
 
     protected Workflowable getWorkflowable() {
         if (this.workflowable == null) {
             this.workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session,
-                    logger, this.document);
+                    getLogger(), this.document);
         }
         return this.workflowable;
     }
@@ -94,7 +91,7 @@
     }
 
     protected Workflow getWorkflowSchema() throws WorkflowException {
-        Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, logger,
+        Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(),
                 this.document);
         return workflow;
     }
@@ -140,9 +137,9 @@
      * @throws WorkflowException if an error occurs. 
      */
     public boolean getValue(String variable) throws WorkflowException {
-        Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session, logger, this.document);
+        Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session, getLogger(), this.document);
         if (workflowable.getVersions().length == 0) {
-            Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, logger, this.document);
+            Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(), this.document);
             return workflow.getInitialValue(variable);
         }
         else {

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/AbstractCondition.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/AbstractCondition.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/AbstractCondition.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/AbstractCondition.java Thu Feb  5 03:00:06 2009
@@ -20,7 +20,7 @@
 
 package org.apache.lenya.workflow.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.workflow.Condition;
 import org.apache.lenya.workflow.WorkflowException;
 

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/ConditionFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/ConditionFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/ConditionFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/ConditionFactory.java Thu Feb  5 03:00:06 2009
@@ -20,9 +20,8 @@
 
 package org.apache.lenya.workflow.impl;
 
-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.workflow.Condition;
 import org.apache.lenya.workflow.WorkflowException;
 
@@ -36,8 +35,7 @@
      * Ctor.
      * @param logger The logger to use.
      */
-    public ConditionFactory(Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public ConditionFactory(Log logger) {
     }
 
     /**
@@ -55,7 +53,6 @@
         try {
             Class clazz = Class.forName(className);
             condition = (Condition) clazz.newInstance();
-            ContainerUtil.enableLogging(condition, getLogger());
             condition.setExpression(expression);
         } catch (ClassNotFoundException e) {
             throw new WorkflowException(e);

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/TransitionImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/TransitionImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/TransitionImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/TransitionImpl.java Thu Feb  5 03:00:06 2009
@@ -20,7 +20,7 @@
 
 package org.apache.lenya.workflow.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.workflow.Action;
 import org.apache.lenya.workflow.Condition;
 import org.apache.lenya.workflow.Transition;

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java Thu Feb  5 03:00:06 2009
@@ -23,8 +23,8 @@
 import java.io.File;
 
 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.workflow.Condition;
 import org.apache.lenya.workflow.Workflow;
 import org.apache.lenya.workflow.WorkflowException;
@@ -61,8 +61,7 @@
      * Ctor.
      * @param logger The logger to use.
      */
-    public WorkflowBuilder(Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public WorkflowBuilder(Log logger) {
     }
 
     /**
@@ -179,7 +178,6 @@
         String destination = element.getAttribute(DESTINATION_ATTRIBUTE);
 
         TransitionImpl transition = new TransitionImpl(source, destination);
-        ContainerUtil.enableLogging(transition, getLogger());
 
         // set event
         Element eventElement = (Element) element.getElementsByTagNameNS(Workflow.NAMESPACE,

Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -21,10 +21,10 @@
 import java.util.Map;
 
 import org.apache.avalon.excalibur.pool.Poolable;
-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.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.cms.cocoon.source.SourceUtil;
 import org.apache.lenya.workflow.Workflow;
 import org.apache.lenya.workflow.WorkflowEngine;

Propchange: lenya/trunk/org.apache.lenya.module.blog/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.blog/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.blog/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-blog</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Blog</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-workflow</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.blog/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.blog/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.blog/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.blog/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java?rev=740982&r1=740437&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java Thu Feb  5 03:00:06 2009
@@ -210,7 +210,7 @@
 
         Map objectModel = ContextHelper.getObjectModel(getContext());
         Request request = ObjectModelHelper.getRequest(objectModel);
-        Session session = request.getSession(false);
+        Session session = request.getCocoonSession(false);
         Identity identity = (Identity) session.getAttribute(Identity.class.getName());
         String title = getParameterAsString(DublinCore.ELEMENT_TITLE);
 

Propchange: lenya/trunk/org.apache.lenya.module.bxe/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.bxe/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.bxe/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.bxe/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.bxe/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-bxe</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module BXE</name>
+  <dependencies>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.bxe/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.bxe/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.bxe/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.cforms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.cforms/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.cforms/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.cforms/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.cforms/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-cforms</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module CForms</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.cforms/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.cforms/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.cforms/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.cforms/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lenya/trunk/org.apache.lenya.module.collection/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.collection/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.collection/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.collection/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.collection/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-collection</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Collection</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.collection/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.collection/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.collection/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.collection/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: lenya/trunk/org.apache.lenya.module.collection/src/main/java/org/apache/lenya/modules/collection/CollectionWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.collection/src/main/java/org/apache/lenya/modules/collection/CollectionWrapper.java?rev=740982&r1=740437&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.collection/src/main/java/org/apache/lenya/modules/collection/CollectionWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.collection/src/main/java/org/apache/lenya/modules/collection/CollectionWrapper.java Thu Feb  5 03:00:06 2009
@@ -25,9 +25,9 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceException;
+import org.apache.cocoon.util.AbstractLogEnabled;
+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;
@@ -57,8 +57,7 @@
      * @param doc The document.
      * @param logger The logger.
      */
-    public CollectionWrapper(Document doc, Logger logger) {
-        enableLogging(logger);
+    public CollectionWrapper(Document doc, Log logger) {
         this.delegate = doc;
     }
 

Propchange: lenya/trunk/org.apache.lenya.module.contactform/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.contactform/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.contactform/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.contactform/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.contactform/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-contactform</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Contact Form</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-ac</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-module-notification</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.contactform/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.contactform/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.contactform/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.contactform/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lenya/trunk/org.apache.lenya.module.development/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.development/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.development/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.development/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.development/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-development</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Development</name>
+  <dependencies>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.development/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.development/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.development/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.editors/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.editors/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.editors/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-editors</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Editors</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-linking</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.editors/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.editors/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.editors/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.editors/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lenya/trunk/org.apache.lenya.module.export/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.export/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.export/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.export/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.export/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-export</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Export</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-linking</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-module-sitetree</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.export/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.export/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.export/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.export/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lenya/trunk/org.apache.lenya.module.fckeditor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-fckeditor</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module FCKEditor</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-linking</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-workflow</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: lenya/trunk/org.apache.lenya.module.kupu/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.kupu/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.kupu/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.kupu/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.kupu/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-kupu</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Kupu</name>
+  <dependencies>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.kupu/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.kupu/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.kupu/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.languageselector/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml

Added: lenya/trunk/org.apache.lenya.module.languageselector/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.languageselector/pom.xml?rev=740982&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.languageselector/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.module.languageselector/pom.xml Thu Feb  5 03:00:06 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.lenya</groupId>
+    <artifactId>lenya-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.lenya</groupId>
+  <artifactId>lenya-module-languageselector</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Lenya Module Language Selector</name>
+  <dependencies>
+  </dependencies>
+</project>

Propchange: lenya/trunk/org.apache.lenya.module.languageselector/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lenya/trunk/org.apache.lenya.module.languageselector/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: lenya/trunk/org.apache.lenya.module.languageselector/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: lenya/trunk/org.apache.lenya.module.lenyadoc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb  5 03:00:06 2009
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+profiles.xml