You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fr...@apache.org on 2009/02/05 04:00:14 UTC
svn commit: r740982 [1/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...

Author: froethenbacher
Date: Thu Feb  5 03:00:06 2009
New Revision: 740982

URL: http://svn.apache.org/viewvc?rev=740982&view=rev
Log:
[MIGRATION] Added code for modules.

Added:
    lenya/trunk/org.apache.lenya.module.blog/   (with props)
    lenya/trunk/org.apache.lenya.module.blog/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.blog/src/
    lenya/trunk/org.apache.lenya.module.blog/src/main/
    lenya/trunk/org.apache.lenya.module.blog/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/blog/java/src/
    lenya/trunk/org.apache.lenya.module.bxe/   (with props)
    lenya/trunk/org.apache.lenya.module.bxe/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.bxe/src/
    lenya/trunk/org.apache.lenya.module.bxe/src/main/
    lenya/trunk/org.apache.lenya.module.cforms/   (with props)
    lenya/trunk/org.apache.lenya.module.cforms/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.cforms/src/
    lenya/trunk/org.apache.lenya.module.cforms/src/main/
    lenya/trunk/org.apache.lenya.module.cforms/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/cforms/java/src/
    lenya/trunk/org.apache.lenya.module.collection/   (with props)
    lenya/trunk/org.apache.lenya.module.collection/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.collection/src/
    lenya/trunk/org.apache.lenya.module.collection/src/main/
    lenya/trunk/org.apache.lenya.module.collection/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/collection/java/src/
    lenya/trunk/org.apache.lenya.module.contactform/   (with props)
    lenya/trunk/org.apache.lenya.module.contactform/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.contactform/src/
    lenya/trunk/org.apache.lenya.module.contactform/src/main/
    lenya/trunk/org.apache.lenya.module.contactform/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/contactform/java/src/
    lenya/trunk/org.apache.lenya.module.development/   (with props)
    lenya/trunk/org.apache.lenya.module.development/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.development/src/
    lenya/trunk/org.apache.lenya.module.development/src/main/
    lenya/trunk/org.apache.lenya.module.editors/   (with props)
    lenya/trunk/org.apache.lenya.module.editors/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.editors/src/
    lenya/trunk/org.apache.lenya.module.editors/src/main/
    lenya/trunk/org.apache.lenya.module.editors/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/editors/java/src/
    lenya/trunk/org.apache.lenya.module.export/   (with props)
    lenya/trunk/org.apache.lenya.module.export/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.export/src/
    lenya/trunk/org.apache.lenya.module.export/src/main/
    lenya/trunk/org.apache.lenya.module.export/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/export/java/src/
    lenya/trunk/org.apache.lenya.module.fckeditor/   (with props)
    lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.fckeditor/src/
    lenya/trunk/org.apache.lenya.module.fckeditor/src/main/
    lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/fckeditor/java/src/
    lenya/trunk/org.apache.lenya.module.kupu/   (with props)
    lenya/trunk/org.apache.lenya.module.kupu/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.kupu/src/
    lenya/trunk/org.apache.lenya.module.kupu/src/main/
    lenya/trunk/org.apache.lenya.module.languageselector/   (with props)
    lenya/trunk/org.apache.lenya.module.languageselector/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.languageselector/src/
    lenya/trunk/org.apache.lenya.module.languageselector/src/main/
    lenya/trunk/org.apache.lenya.module.lenyadoc/   (with props)
    lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.lenyadoc/src/
    lenya/trunk/org.apache.lenya.module.lenyadoc/src/main/
    lenya/trunk/org.apache.lenya.module.lenyadoc/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/lenyadoc/java/src/
    lenya/trunk/org.apache.lenya.module.linkcheck/   (with props)
    lenya/trunk/org.apache.lenya.module.linkcheck/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.linkcheck/src/
    lenya/trunk/org.apache.lenya.module.linkcheck/src/main/
    lenya/trunk/org.apache.lenya.module.linkcheck/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/linkcheck/java/src/
    lenya/trunk/org.apache.lenya.module.links/   (with props)
    lenya/trunk/org.apache.lenya.module.links/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.links/src/
    lenya/trunk/org.apache.lenya.module.links/src/main/
    lenya/trunk/org.apache.lenya.module.lucene/   (with props)
    lenya/trunk/org.apache.lenya.module.lucene/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.lucene/src/
    lenya/trunk/org.apache.lenya.module.lucene/src/main/
    lenya/trunk/org.apache.lenya.module.lucene/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/lucene/java/src/
    lenya/trunk/org.apache.lenya.module.menubar/   (with props)
    lenya/trunk/org.apache.lenya.module.menubar/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.menubar/src/
    lenya/trunk/org.apache.lenya.module.menubar/src/main/
    lenya/trunk/org.apache.lenya.module.menubar/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/menubar/java/src/
    lenya/trunk/org.apache.lenya.module.migration/   (with props)
    lenya/trunk/org.apache.lenya.module.migration/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.migration/src/
    lenya/trunk/org.apache.lenya.module.migration/src/main/
    lenya/trunk/org.apache.lenya.module.navigation/   (with props)
    lenya/trunk/org.apache.lenya.module.navigation/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.navigation/src/
    lenya/trunk/org.apache.lenya.module.navigation/src/main/
    lenya/trunk/org.apache.lenya.module.navigation/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/navigation/java/src/
    lenya/trunk/org.apache.lenya.module.neutron/   (with props)
    lenya/trunk/org.apache.lenya.module.neutron/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.neutron/src/
    lenya/trunk/org.apache.lenya.module.neutron/src/main/
    lenya/trunk/org.apache.lenya.module.news/   (with props)
    lenya/trunk/org.apache.lenya.module.news/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.news/src/
    lenya/trunk/org.apache.lenya.module.news/src/main/
    lenya/trunk/org.apache.lenya.module.news/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/news/java/src/
    lenya/trunk/org.apache.lenya.module.notification/   (with props)
    lenya/trunk/org.apache.lenya.module.notification/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.notification/src/
    lenya/trunk/org.apache.lenya.module.notification/src/main/
    lenya/trunk/org.apache.lenya.module.notification/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/notification/java/src/
    lenya/trunk/org.apache.lenya.module.opendocument/   (with props)
    lenya/trunk/org.apache.lenya.module.opendocument/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.opendocument/src/
    lenya/trunk/org.apache.lenya.module.opendocument/src/main/
    lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/opendocument/java/src/
    lenya/trunk/org.apache.lenya.module.prettyprinting/   (with props)
    lenya/trunk/org.apache.lenya.module.prettyprinting/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.prettyprinting/src/
    lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/
    lenya/trunk/org.apache.lenya.module.profiling/   (with props)
    lenya/trunk/org.apache.lenya.module.profiling/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.profiling/src/
    lenya/trunk/org.apache.lenya.module.profiling/src/main/
    lenya/trunk/org.apache.lenya.module.resource/   (with props)
    lenya/trunk/org.apache.lenya.module.resource/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.resource/src/
    lenya/trunk/org.apache.lenya.module.resource/src/main/
    lenya/trunk/org.apache.lenya.module.resource/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/resource/java/src/
    lenya/trunk/org.apache.lenya.module.simplesite/   (with props)
    lenya/trunk/org.apache.lenya.module.simplesite/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.simplesite/src/
    lenya/trunk/org.apache.lenya.module.simplesite/src/main/
    lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/simplesite/java/src/
    lenya/trunk/org.apache.lenya.module.sitetree/   (with props)
    lenya/trunk/org.apache.lenya.module.sitetree/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.sitetree/src/
    lenya/trunk/org.apache.lenya.module.sitetree/src/main/
    lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/sitetree/java/src/
    lenya/trunk/org.apache.lenya.module.sourcerepository/   (with props)
    lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.sourcerepository/src/
    lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/
    lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/sourcerepository/java/src/
    lenya/trunk/org.apache.lenya.module.svg/   (with props)
    lenya/trunk/org.apache.lenya.module.svg/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.svg/src/
    lenya/trunk/org.apache.lenya.module.svg/src/main/
    lenya/trunk/org.apache.lenya.module.svg/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/svg/java/src/
    lenya/trunk/org.apache.lenya.module.tinymce/   (with props)
    lenya/trunk/org.apache.lenya.module.tinymce/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.tinymce/src/
    lenya/trunk/org.apache.lenya.module.tinymce/src/main/
    lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/tinymce/java/src/
    lenya/trunk/org.apache.lenya.module.usecasedocument/   (with props)
    lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.usecasedocument/src/
    lenya/trunk/org.apache.lenya.module.usecasedocument/src/main/
    lenya/trunk/org.apache.lenya.module.usecasedocument/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/usecasedocument/java/src/
    lenya/trunk/org.apache.lenya.module.webdav/   (with props)
    lenya/trunk/org.apache.lenya.module.webdav/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.webdav/src/
    lenya/trunk/org.apache.lenya.module.webdav/src/main/
    lenya/trunk/org.apache.lenya.module.webdav/src/main/java/   (props changed)
      - copied from r740437, lenya/branches/BRANCH_2_0_X/src/modules/webdav/java/src/
    lenya/trunk/org.apache.lenya.module.xhtml/   (with props)
    lenya/trunk/org.apache.lenya.module.xhtml/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.xhtml/src/
    lenya/trunk/org.apache.lenya.module.xhtml/src/main/
    lenya/trunk/org.apache.lenya.module.xopus/   (with props)
    lenya/trunk/org.apache.lenya.module.xopus/pom.xml   (with props)
    lenya/trunk/org.apache.lenya.module.xopus/src/
    lenya/trunk/org.apache.lenya.module.xopus/src/main/
Removed:
    lenya/trunk/org.apache.lenya.core.notification/
Modified:
    lenya/trunk/org.apache.lenya.core.ac/pom.xml
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManagerFactory.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FilePolicyManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRole.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroup.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroupable.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractIPRange.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractUser.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AnonymousAuthenticator.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/UserAuthenticator.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java
    lenya/trunk/org.apache.lenya.core.acusecases/pom.xml
    lenya/trunk/org.apache.lenya.core.administration/pom.xml
    lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
    lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java
    lenya/trunk/org.apache.lenya.core.api/pom.xml
    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/cocoon/components/context/ContextUtility.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/LastModSourceSelector.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSource.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSourceFactory.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.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/RepositoryManagerImpl.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/cms/site/AbstractSiteManager.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/IdentityMapImpl.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
    lenya/trunk/org.apache.lenya.core.cache/pom.xml
    lenya/trunk/org.apache.lenya.core.cache/src/main/java/org/apache/lenya/ac/cache/SourceCacheImpl.java
    lenya/trunk/org.apache.lenya.core.i18n/pom.xml
    lenya/trunk/org.apache.lenya.core.impl/pom.xml
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/module/ModuleManagerImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilderImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
    lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java
    lenya/trunk/org.apache.lenya.core.janitor/pom.xml
    lenya/trunk/org.apache.lenya.core.ldap/pom.xml
    lenya/trunk/org.apache.lenya.core.ldap/src/main/java/org/apache/lenya/ac/ldap/LDAPUser.java
    lenya/trunk/org.apache.lenya.core.linking/pom.xml
    lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
    lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ContentLinkManager.java
    lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java
    lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
    lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/impl/GlobalProxiesImpl.java
    lenya/trunk/org.apache.lenya.core.metadata/pom.xml
    lenya/trunk/org.apache.lenya.core.monitoring/pom.xml
    lenya/trunk/org.apache.lenya.core.observation/pom.xml
    lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
    lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
    lenya/trunk/org.apache.lenya.core.properties/pom.xml
    lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml
    lenya/trunk/org.apache.lenya.core.templating/pom.xml
    lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
    lenya/trunk/org.apache.lenya.core.usecase/pom.xml
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/matching/UsecaseRegistrationMatcher.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/gui/impl/GUIManagerImpl.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseResolverImpl.java
    lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
    lenya/trunk/org.apache.lenya.core.workflow/pom.xml
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/AbstractCondition.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/ConditionFactory.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/TransitionImpl.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java
    lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
    lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
    lenya/trunk/org.apache.lenya.module.collection/src/main/java/org/apache/lenya/modules/collection/CollectionWrapper.java
    lenya/trunk/org.apache.lenya.module.lenyadoc/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
    lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java
    lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java
    lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
    lenya/trunk/org.apache.lenya.parent/pom.xml
    lenya/trunk/pom.xml

Modified: lenya/trunk/org.apache.lenya.core.ac/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.ac/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-ac</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManagerFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManagerFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManagerFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManagerFactory.java Thu Feb  5 03:00:06 2009
@@ -24,11 +24,11 @@
 
 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.ac.AccreditableManager;
 import org.apache.lenya.ac.AccreditableManagerFactory;
 import org.apache.lenya.ac.UserType;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java Thu Feb  5 03:00:06 2009
@@ -29,8 +29,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.ConsoleLogger;
-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.Machine;
@@ -64,7 +63,7 @@
             InetAddress subnetMask = InetAddress.getByName(args[1]);
             Machine machine = new Machine(args[2]);
 
-            InetAddressUtil util = new InetAddressUtil(new ConsoleLogger());
+            InetAddressUtil util = new InetAddressUtil(getLogger());
             if (util.contains(networkAddress, subnetMask, machine.getAddress())) {
                 System.out.println("true");
             } else {
@@ -82,7 +81,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public FileIPRange(ItemManager itemManager, Logger logger) {
+    public FileIPRange(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 
@@ -92,7 +91,7 @@
      * @param logger The logger.
      * @param id The IP range ID.
      */
-    public FileIPRange(ItemManager itemManager, Logger logger, String id) {
+    public FileIPRange(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/FileItemManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java Thu Feb  5 03:00:06 2009
@@ -35,8 +35,8 @@
 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.logger.Logger;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.Group;
@@ -81,7 +81,6 @@
 
         this.configurationDirectory = _configurationDirectory;
         this.notifier = new DirectoryChangeNotifier(_configurationDirectory, getFileFilter());
-        this.notifier.enableLogging(getLogger());
         loadItems();
     }
 
@@ -157,7 +156,7 @@
         String klass = ItemConfiguration.getItemClass(config);
         if (item == null) {
             try {
-                Class[] paramTypes = { ItemManager.class, Logger.class };
+                Class[] paramTypes = { ItemManager.class, Log.class };
                 Constructor ctor = Class.forName(klass).getConstructor(paramTypes);
                 Object[] params = { this, getLogger() };
                 item = (Item) ctor.newInstance(params);

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FilePolicyManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FilePolicyManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FilePolicyManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FilePolicyManager.java Thu Feb  5 03:00:06 2009
@@ -34,13 +34,13 @@
 import java.util.Set;
 
 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;
 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.cocoon.util.NetUtils;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRole.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRole.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRole.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRole.java Thu Feb  5 03:00:06 2009
@@ -24,7 +24,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;
@@ -45,7 +45,7 @@
      * @param logger The logger.
      * @param id The role ID.
      */
-    public FileRole(ItemManager itemManager, Logger logger, String id) {
+    public FileRole(ItemManager itemManager, Log logger, String id) {
         this(itemManager, logger);
         setId(id);
     }
@@ -57,7 +57,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public FileRole(ItemManager itemManager, Logger logger) {
+    public FileRole(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
         FileItemManager fileItemManager = (FileItemManager) itemManager;
         setConfigurationDirectory(fileItemManager.getConfigurationDirectory());

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java Thu Feb  5 03:00:06 2009
@@ -25,7 +25,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.Group;
 import org.apache.lenya.ac.GroupManager;
@@ -58,7 +58,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public FileUser(ItemManager itemManager, Logger logger) {
+    public FileUser(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
         FileItemManager fileItemManager = (FileItemManager) itemManager;
         setConfigurationDirectory(fileItemManager.getConfigurationDirectory());
@@ -73,7 +73,7 @@
      * @param email the users email address
      * @param password the users password
      */
-    public FileUser(ItemManager itemManager, Logger logger, String id, String fullName,
+    public FileUser(ItemManager itemManager, Log logger, String id, String fullName,
             String email, String password) {
         super(itemManager, logger, id, fullName, email, password);
         FileItemManager fileItemManager = (FileItemManager) itemManager;

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

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java Thu Feb  5 03:00:06 2009
@@ -25,8 +25,8 @@
 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.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.GroupManager;
@@ -46,8 +46,7 @@
     /**
      * @param logger The logger.
      */
-    public AbstractAccreditableManager(Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public AbstractAccreditableManager(Log logger) {
     }
 
     private UserManager userManager = null;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroup.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroup.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroup.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroup.java Thu Feb  5 03:00:06 2009
@@ -23,7 +23,7 @@
 import java.util.HashSet;
 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.Accreditable;
 import org.apache.lenya.ac.Group;
@@ -41,7 +41,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public AbstractGroup(ItemManager itemManager, Logger logger) {
+    public AbstractGroup(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 
@@ -51,7 +51,7 @@
      * @param logger The logger.
      * @param id The group ID.
      */
-    public AbstractGroup(ItemManager itemManager, Logger logger, String id) {
+    public AbstractGroup(ItemManager itemManager, Log logger, String id) {
         super(itemManager, logger);
         setId(id);
     }

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroupable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroupable.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroupable.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractGroupable.java Thu Feb  5 03:00:06 2009
@@ -22,7 +22,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.Accreditable;
 import org.apache.lenya.ac.Group;
 import org.apache.lenya.ac.Groupable;
@@ -39,7 +39,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public AbstractGroupable(ItemManager itemManager, Logger logger) {
+    public AbstractGroupable(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractIPRange.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractIPRange.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractIPRange.java Thu Feb  5 03:00:06 2009
@@ -25,7 +25,7 @@
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.IPRange;
 import org.apache.lenya.ac.ItemManager;
@@ -74,7 +74,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public AbstractIPRange(ItemManager itemManager, Logger logger) {
+    public AbstractIPRange(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
         try {
             this.networkAddress = InetAddress.getLocalHost();
@@ -106,7 +106,7 @@
      * @param logger The logger.
      * @param id The IP range ID.
      */
-    public AbstractIPRange(ItemManager itemManager, Logger logger, String id) {
+    public AbstractIPRange(ItemManager itemManager, Log logger, String id) {
         super(itemManager, logger);
         setId(id);
     }

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java Thu Feb  5 03:00:06 2009
@@ -18,9 +18,8 @@
 
 package org.apache.lenya.ac.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.ac.AccreditableManager;
 import org.apache.lenya.ac.Item;
 import org.apache.lenya.ac.ItemManager;
@@ -45,12 +44,9 @@
      * @param itemManager The item manager this item belongs to.
      * @param logger The logger.
      */
-    public AbstractItem(ItemManager itemManager, Logger logger) {
+    public AbstractItem(ItemManager itemManager, Log logger) {
         Assert.notNull("item manager", itemManager);
         this.itemManager = itemManager;
-
-        Assert.notNull("logger", logger);
-        ContainerUtil.enableLogging(this, logger);
     }
 
     /**

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java Thu Feb  5 03:00:06 2009
@@ -20,7 +20,7 @@
 
 package org.apache.lenya.ac.impl;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.ItemManager;
 import org.apache.lenya.ac.Role;
 import org.apache.lenya.util.Assert;
@@ -36,7 +36,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public AbstractRole(ItemManager itemManager, Logger logger) {
+    public AbstractRole(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 
@@ -46,7 +46,7 @@
      * @param logger The logger.
      * @param name The role name.
      */
-    public AbstractRole(ItemManager itemManager, Logger logger, String name) {
+    public AbstractRole(ItemManager itemManager, Log logger, String name) {
         this(itemManager, logger);
         Assert.notNull("name", name);
         setName(name);

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractUser.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractUser.java Thu Feb  5 03:00:06 2009
@@ -18,7 +18,7 @@
 
 package org.apache.lenya.ac.impl;
 
-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.Password;
@@ -40,7 +40,7 @@
      * @param itemManager The item manager.
      * @param logger The logger.
      */
-    public AbstractUser(ItemManager itemManager, Logger logger) {
+    public AbstractUser(ItemManager itemManager, Log logger) {
         super(itemManager, logger);
     }
 
@@ -53,7 +53,7 @@
      * @param _email the users email address
      * @param password the users password
      */
-    public AbstractUser(ItemManager itemManager, Logger logger, String id, String fullName,
+    public AbstractUser(ItemManager itemManager, Log logger, String id, String fullName,
             String _email, String password) {
         this(itemManager, logger);
         setId(id);

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AnonymousAuthenticator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AnonymousAuthenticator.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AnonymousAuthenticator.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AnonymousAuthenticator.java Thu Feb  5 03:00:06 2009
@@ -17,8 +17,8 @@
 
 package org.apache.lenya.ac.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.Authenticator;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java Thu Feb  5 03:00:06 2009
@@ -30,7 +30,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.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
@@ -40,6 +39,7 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccessController;
 import org.apache.lenya.ac.Accreditable;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/UserAuthenticator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/UserAuthenticator.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/UserAuthenticator.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/UserAuthenticator.java Thu Feb  5 03:00:06 2009
@@ -18,8 +18,8 @@
 package org.apache.lenya.ac.impl;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.Authenticator;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java Thu Feb  5 03:00:06 2009
@@ -24,13 +24,13 @@
 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.parameters.ParameterException;
 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.AccessControlException;
 import org.apache.lenya.ac.Accreditable;
 import org.apache.lenya.ac.AccreditableManager;

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java Thu Feb  5 03:00:06 2009
@@ -25,10 +25,10 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-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.excalibur.source.Source;
 import org.apache.excalibur.source.SourceNotFoundException;
 import org.apache.excalibur.source.SourceResolver;

Modified: lenya/trunk/org.apache.lenya.core.acusecases/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/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-acusecases</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.administration/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.administration/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-administration</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java Thu Feb  5 03:00:06 2009
@@ -60,7 +60,6 @@
         String description = getParameterAsString(IPRangeProfile.DESCRIPTION);
 
         IPRange ipRange = getIpRangeManager().add(id);
-        ContainerUtil.enableLogging(ipRange, getLogger());
 
         ipRange.setName(name);
         ipRange.setDescription(description);

Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java Thu Feb  5 03:00:06 2009
@@ -69,7 +69,6 @@
 
         if (className.equals(LDAPUser.class.getName())) {
             LDAPUser ldapUser = new LDAPUser(getUserManager(), getLogger());
-            ContainerUtil.enableLogging(ldapUser, getLogger());
 
             try {
                 if (!ldapUser.existsUser(ldapId)) {
@@ -118,7 +117,6 @@
             user.setName(fullName);
             user.setPassword(password);
         }
-        ContainerUtil.enableLogging(user, getLogger());
         user.setDescription(description);
         user.save();
         getUserManager().add(user);

Modified: lenya/trunk/org.apache.lenya.core.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.api/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-api</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.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=740982&r1=740981&r2=740982&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:00:06 2009
@@ -29,9 +29,9 @@
 import java.io.Serializable;
 
 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.environment.Session;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 
 /**
  * Identity object. Used to store the authenticated accreditables in the session.
@@ -47,8 +47,7 @@
      * Ctor.
      * @param logger The logger.
      */
-    public Identity(Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public Identity(Log logger) {
     }
     
     /**

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/context/ContextUtility.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/context/ContextUtility.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/context/ContextUtility.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/context/ContextUtility.java Thu Feb  5 03:00:06 2009
@@ -22,10 +22,10 @@
 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.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.util.AbstractLogEnabled;
 
 /**
  * Utility class for getting the context, request, response and

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/LastModSourceSelector.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/LastModSourceSelector.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/LastModSourceSelector.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/selection/LastModSourceSelector.java Thu Feb  5 03:00:06 2009
@@ -17,11 +17,11 @@
 package org.apache.lenya.cms.cocoon.selection;
 
 import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceNotFoundException;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.avalon.framework.activity.Disposable;
-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;

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

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaSourceFactory.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.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -36,6 +35,7 @@
 import org.apache.cocoon.components.modules.input.JXPathHelperConfiguration;
 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.api/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java Thu Feb  5 03:00:06 2009
@@ -31,9 +31,9 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.environment.Request;
+import org.apache.commons.logging.Log;
 import org.apache.excalibur.source.ModifiableTraversableSource;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
@@ -62,7 +62,7 @@
     private ServiceManager manager;
     private ContentHolder content;
     private Session session;
-    private Logger logger;
+    private Log logger;
     protected static final String SCHEME = "lenya";
 
     /**
@@ -73,7 +73,7 @@
      * @throws SourceException if an error occurs.
      * @throws MalformedURLException if an error occurs.
      */
-    public RepositorySource(ServiceManager manager, String uri, Session session, Logger logger)
+    public RepositorySource(ServiceManager manager, String uri, Session session, Log logger)
             throws SourceException, MalformedURLException {
         this.manager = manager;
         this.logger = logger;
@@ -171,7 +171,7 @@
         return (Node) this.content;
     }
 
-    protected Logger getLogger() {
+    protected Log getLogger() {
         return this.logger;
     }
 

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.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.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -33,6 +32,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.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSource.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSource.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSource.java Thu Feb  5 03:00:06 2009
@@ -24,7 +24,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.cocoon.util.MIMEUtils;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceNotFoundException;

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSourceFactory.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/source/ZipSourceFactory.java Thu Feb  5 03:00:06 2009
@@ -22,11 +22,11 @@
 import java.net.MalformedURLException;
 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.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.SourceException;
 import org.apache.excalibur.source.SourceFactory;

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/observation/AbstractRepositoryListener.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;
 
 /**
  * Abstract repository listener implementation which registeres with the observation

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java Thu Feb  5 03:00:06 2009
@@ -18,10 +18,10 @@
 
 package org.apache.lenya.cms.publication;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 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.site.SiteNode;
 
 /**

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=740982&r1=740981&r2=740982&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:00:06 2009
@@ -29,8 +29,8 @@
 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.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/RepositoryManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManagerImpl.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.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.ac.Identity;
 
 /**

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=740982&r1=740981&r2=740982&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:00:06 2009
@@ -24,10 +24,10 @@
 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.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.cms.observation.ObservationRegistry;
 import org.apache.lenya.cms.observation.RepositoryEvent;
@@ -60,7 +60,7 @@
      * @param manager The service manager.
      * @param logger The logger.
      */
-    public SessionImpl(Identity identity, boolean modifiable, ServiceManager manager, Logger logger) {
+    public SessionImpl(Identity identity, boolean modifiable, ServiceManager manager, Log logger) {
 
         ContainerUtil.enableLogging(this, logger);
 

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteManager.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteManager.java Thu Feb  5 03:00:06 2009
@@ -21,10 +21,10 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
-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.DocumentFactory;
 
 /**

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/site/AbstractSiteNode.java Thu Feb  5 03:00:06 2009
@@ -20,8 +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.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.util.Assert;
 
@@ -35,10 +35,8 @@
     private String uuid;
 
     protected AbstractSiteNode(Publication publication, SiteStructure structure, String path,
-            String uuid, Logger logger) {
+            String uuid, Log logger) {
         
-        ContainerUtil.enableLogging(this, logger);
-
         Assert.notNull("structure", structure);
         this.structure = structure;
 

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Thu Feb  5 03:00:06 2009
@@ -27,8 +27,8 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.User;

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java Thu Feb  5 03:00:06 2009
@@ -23,8 +23,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-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;
 
 /**
  * A utility class for InetAddress. Also see http://jodies.de/ipcalc
@@ -35,8 +35,7 @@
      * Ctor.
      * @param logger The logger.
      */
-    public InetAddressUtil(Logger logger) {
-        enableLogging(logger);
+    public InetAddressUtil(Log logger) {
     }
 
     /**

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/IdentityMapImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/IdentityMapImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/IdentityMapImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/IdentityMapImpl.java Thu Feb  5 03:00:06 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;
 
 /**
  * Identity map implementation.
@@ -41,8 +40,7 @@
      * Ctor.
      * @param logger The logger.
      */
-    public IdentityMapImpl(Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public IdentityMapImpl(Log logger) {
     }
 
     public Object get(IdentifiableFactory factory, String key) {

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java Thu Feb  5 03:00:06 2009
@@ -24,8 +24,8 @@
 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.ac.Identity;
 import org.apache.lenya.util.Assert;
 
@@ -42,8 +42,7 @@
      * @param identity The identity.
      * @param logger The logger.
      */
-    public UnitOfWorkImpl(IdentityMap map, Identity identity, Logger logger) {
-        ContainerUtil.enableLogging(this, logger);
+    public UnitOfWorkImpl(IdentityMap map, Identity identity, Log logger) {
 
         Assert.notNull(map);
         this.identityMap = map;

Modified: lenya/trunk/org.apache.lenya.core.cache/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cache/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cache/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.cache/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-cache</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.cache/src/main/java/org/apache/lenya/ac/cache/SourceCacheImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cache/src/main/java/org/apache/lenya/ac/cache/SourceCacheImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cache/src/main/java/org/apache/lenya/ac/cache/SourceCacheImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.cache/src/main/java/org/apache/lenya/ac/cache/SourceCacheImpl.java Thu Feb  5 03:00:06 2009
@@ -23,11 +23,11 @@
 import java.net.MalformedURLException;
 
 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.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.SourceNotFoundException;
 import org.apache.excalibur.source.SourceResolver;

Modified: lenya/trunk/org.apache.lenya.core.i18n/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.i18n/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.i18n/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.i18n/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-i18n</artifactId>

Modified: lenya/trunk/org.apache.lenya.core.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/pom.xml?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/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-impl</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.impl/src/main/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java Thu Feb  5 03:00:06 2009
@@ -25,11 +25,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;
 
 /**
  * Avalon-based element set.

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryImpl.java Thu Feb  5 03:00:06 2009
@@ -21,8 +21,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;
 
 /**
  * Meta data registry implementation.

Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/module/ModuleManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/module/ModuleManagerImpl.java?rev=740982&r1=740981&r2=740982&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/module/ModuleManagerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/module/ModuleManagerImpl.java Thu Feb  5 03:00:06 2009
@@ -25,8 +25,8 @@
 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.thread.ThreadSafe;
+import org.apache.cocoon.util.AbstractLogEnabled;
 
 /**
  * Module manager implementation.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org