svn commit: r741654 [1/9] - in /lenya/trunk: org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/ org...
[email protected] Fri, 06 Feb 2009 17:55:33 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Fri Feb 6 17:55:28 2009
New Revision: 741654
URL: http://svn.apache.org/viewvc?rev=741654&view=rev
Log:
Continue springification.
Added:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/ResourceTypeResolver.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/Session.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
Modified:
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/AnonymousAuthenticator.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.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/PublicationAccessControllerResolver.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/SslRedirectAction.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/modules/ac/UserInfoTransformer.java
lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControlUsecase.java
lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java
lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Usecases.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/publication/usecases/EditPubConf.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/AccessController.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Authenticator.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.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/components/modules/input/DocumentInfoModule.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.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/SourceUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.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/publication/DocumentUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PublicationUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManager.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentHelper.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.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/SiteUtil.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/cms/workflow/RoleCondition.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/ServletHelper.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/ValidationUtil.java
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/publication/ResourceTypeSelector.java
lenya/trunk/org.apache.lenya.core.janitor/pom.xml
lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyModule.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java
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/cocoon/transformation/IncomingProxyTransformer.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.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/OutgoingLinkRewriter.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/ServletLinkRewriter.java
lenya/trunk/org.apache.lenya.core.metadata/pom.xml
lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/MetaDataModule.java
lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java
lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/MetaDataTransformer.java
lenya/trunk/org.apache.lenya.core.properties/pom.xml
lenya/trunk/org.apache.lenya.core.properties/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PropertiesModule.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Assets.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Copy.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Cut.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java
lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManagerImpl.java
lenya/trunk/org.apache.lenya.core.templating/src/main/java/org/apache/lenya/cms/publication/usecases/CreatePublicationFromTemplate.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.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/Usecase.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseView.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/ManageJobs.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java
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/InvokeWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.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.module.blog/src/main/java/org/apache/cocoon/generation/BlogGenerator.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/cocoon/generation/BlogOverviewGenerator.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.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.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java
lenya/trunk/org.apache.lenya.module.contactform/src/main/java/org/apache/lenya/cms/contactform/ContactForm.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/InsertAsset.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Import.java
lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java
lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java
lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml
lenya/trunk/org.apache.lenya.module.lenyadoc/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
lenya/trunk/org.apache.lenya.module.linkcheck/pom.xml
lenya/trunk/org.apache.lenya.module.linkcheck/src/main/java/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/Index.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/transformation/LuceneIndexTransformer2.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexSite.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java
lenya/trunk/org.apache.lenya.module.menubar/src/main/java/org/apache/lenya/modules/menubar/MenuFilterTransformer.java
lenya/trunk/org.apache.lenya.module.navigation/pom.xml
lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java
lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/InboxModule.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/AbstractInboxUsecase.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java
lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/site/usecases/UploadOpenDocument.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/UploadResource.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/SimpleSiteManager.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeSiteManager.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java
lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
lenya/trunk/org.apache.lenya.module.usecasedocument/pom.xml
lenya/trunk/org.apache.lenya.module.usecasedocument/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UsecaseDocumentModule.java
lenya/trunk/org.apache.lenya.module.usecasedocument/src/main/java/org/apache/lenya/cms/site/usecases/CreateUsecaseDocument.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Mkcol.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRSourceNode.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/JCRImport.java
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=741654&r1=741653&r2=741654&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 Fri Feb 6 17:55:28 2009
@@ -18,10 +18,6 @@
package org.apache.lenya.ac.impl;
-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;
@@ -34,13 +30,13 @@
* Abstract implementation for access controller resolvers.
* @version $Id$
*/
-public abstract class AbstractAccessControllerResolver
- extends AbstractLogEnabled
- implements AccessControllerResolver, Serviceable, ThreadSafe {
+public abstract class AbstractAccessControllerResolver extends AbstractLogEnabled implements
+ AccessControllerResolver {
protected static final int CAPACITY = 1000;
private CacheMap cache;
-
+ private SourceResolver sourceResolver;
+
protected CacheMap getCache() {
if (this.cache == null) {
this.cache = new CacheMap(CAPACITY, getLogger());
@@ -51,26 +47,19 @@
/**
* @see org.apache.lenya.ac.AccessControllerResolver#resolveAccessController(java.lang.String)
*/
- public AccessController resolveAccessController(String webappUrl)
- throws AccessControlException {
+ public AccessController resolveAccessController(String webappUrl) throws AccessControlException {
- SourceResolver resolver = null;
AccessController controller = null;
Object key = null;
try {
- resolver = (SourceResolver) getManager().lookup(SourceResolver.ROLE);
- key = generateCacheKey(webappUrl, resolver);
+ key = generateCacheKey(webappUrl, getSourceResolver());
getLogger().debug("Access controller cache key: [" + key + "]");
} catch (Exception e) {
throw new AccessControlException(e);
- } finally {
- if (resolver != null) {
- getManager().release(resolver);
- }
}
-
+
CacheMap cache = getCache();
synchronized (cache) {
@@ -95,7 +84,7 @@
* @throws AccessControlException when something went wrong.
*/
protected Object generateCacheKey(String webappUrl, SourceResolver resolver)
- throws AccessControlException {
+ throws AccessControlException {
Object key;
try {
key = URLKeyUtil.generateKey(resolver, webappUrl);
@@ -112,35 +101,23 @@
* @throws AccessControlException when something went wrong.
*/
protected abstract AccessController doResolveAccessController(String webappUrl)
- throws AccessControlException;
+ throws AccessControlException;
/**
* @see org.apache.lenya.ac.AccessControllerResolver#release(org.apache.lenya.ac.AccessController)
*/
public void release(AccessController controller) {
/*
- if (controller != null) {
- getManager().release(controller);
- }
- */
+ * if (controller != null) { getManager().release(controller); }
+ */
}
- protected ServiceManager manager;
-
- /**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager _manager) throws ServiceException {
- getLogger().debug("Servicing [" + getClass().getName() + "]");
- this.manager = _manager;
+ public void setSourceResolver(SourceResolver sourceResolver) {
+ this.sourceResolver = sourceResolver;
}
- /**
- * Returns the service manager of this Serviceable.
- * @return A service manager.
- */
- public ServiceManager getManager() {
- return this.manager;
+ public SourceResolver getSourceResolver() {
+ return sourceResolver;
}
}
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=741654&r1=741653&r2=741654&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 Fri Feb 6 17:55:28 2009
@@ -17,7 +17,8 @@
package org.apache.lenya.ac.impl;
-import org.apache.cocoon.environment.Request;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
@@ -35,11 +36,7 @@
public class AnonymousAuthenticator extends AbstractLogEnabled implements Authenticator {
- /**
- * @see org.apache.lenya.ac.Authenticator#authenticate(org.apache.lenya.ac.AccreditableManager,
- * org.apache.cocoon.environment.Request)
- */
- public boolean authenticate(AccreditableManager accreditableManager, Request request)
+ public boolean authenticate(AccreditableManager accreditableManager, HttpServletRequest request)
throws AccessControlException {
String username = "anonymous";
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java Fri Feb 6 17:55:28 2009
@@ -21,25 +21,20 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
-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.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccessController;
import org.apache.lenya.ac.AccessControllerResolver;
/**
- * Access controller resolver composed of other access controller resolvers.
- * The member resolvers are called one after the other to resolve the access controllers.
+ * Access controller resolver composed of other access controller resolvers. The member resolvers
+ * are called one after the other to resolve the access controllers.
*
* @version $Id$
*/
-public class ComposableAccessControllerResolver
- extends AbstractAccessControllerResolver
- implements Configurable, Disposable {
+public class ComposableAccessControllerResolver extends AbstractAccessControllerResolver {
/**
* @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
@@ -48,28 +43,18 @@
AccessController controller = null;
- try {
-
- if (this.selector == null) {
- this.selector =
- (ServiceSelector) getManager().lookup(AccessControllerResolver.ROLE + "Selector");
- }
-
- String[] types = getResolverTypes();
- int i = 0;
- while (controller == null && i < types.length) {
-
- getLogger().debug("Trying to resolve AC resolver for type [" + types[i] + "]");
- AccessControllerResolver resolver =
- (AccessControllerResolver) this.selector.select(types[i]);
- controller = resolver.resolveAccessController(url);
- setResolver(controller, resolver);
- getLogger().debug("Resolved access controller [" + controller + "]");
- i++;
- }
-
- } catch (ServiceException e) {
- throw new AccessControlException(e);
+ String[] types = getResolverTypes();
+ int i = 0;
+ while (controller == null && i < types.length) {
+
+ getLogger().debug("Trying to resolve AC resolver for type [" + types[i] + "]");
+ AccessControllerResolver resolver = (AccessControllerResolver) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(
+ AccessControllerResolver.ROLE + "/" + types[i]);
+ controller = resolver.resolveAccessController(url);
+ setResolver(controller, resolver);
+ getLogger().debug("Resolved access controller [" + controller + "]");
+ i++;
}
return controller;
@@ -84,24 +69,21 @@
assert controller != null;
AccessControllerResolver resolver = getResolver(controller);
resolver.release(controller);
- this.selector.release(resolver);
}
/**
- * Returns the access controller resolver that was used to resolve a
- * specific access controller.
+ * Returns the access controller resolver that was used to resolve a specific access controller.
* @param controller The access controller.
* @return An AC resolver.
*/
protected AccessControllerResolver getResolver(AccessController controller) {
- AccessControllerResolver resolver =
- (AccessControllerResolver) this.controllerToResolver.get(controller);
+ AccessControllerResolver resolver = (AccessControllerResolver) this.controllerToResolver
+ .get(controller);
return resolver;
}
-
+
/**
- * Sets the access controller resolver that was used to resolve a
- * specific access controller.
+ * Sets the access controller resolver that was used to resolve a specific access controller.
* @param controller The access controller.
* @param resolver An AC resolver.
*/
@@ -113,7 +95,6 @@
protected static final String TYPE_ATTRIBUTE = "type";
private String[] resolverTypes;
- private ServiceSelector selector;
/**
* @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
@@ -134,13 +115,4 @@
return this.resolverTypes;
}
- /**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- if (this.selector != null) {
- getManager().release(this.selector);
- }
- }
-
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java Fri Feb 6 17:55:28 2009
@@ -21,6 +21,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.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccessController;
@@ -28,21 +29,20 @@
* Configurable access controller resolver.
* @version $Id$
*/
-public class ConfigurableAccessControllerResolver
- extends AbstractAccessControllerResolver
- implements Configurable {
+public class ConfigurableAccessControllerResolver extends AbstractAccessControllerResolver
+ implements Configurable {
/**
* @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
*/
public AccessController doResolveAccessController(String webappUrl)
- throws AccessControlException {
+ throws AccessControlException {
AccessController accessController = null;
try {
- accessController =
- (AccessController) getManager().lookup(
- AccessController.ROLE + "/" + this.accessControllerType);
+ accessController = (AccessController) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(
+ AccessController.ROLE + "/" + this.accessControllerType);
if (accessController instanceof Configurable) {
((Configurable) accessController).configure(this.accessControllerConfiguration);
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=741654&r1=741653&r2=741654&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 Fri Feb 6 17:55:28 2009
@@ -25,6 +25,8 @@
import java.util.Map;
import java.util.regex.*;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
@@ -79,10 +81,7 @@
private List authorizerKeys = new ArrayList();
private Authenticator authenticator;
- /**
- * @see org.apache.lenya.ac.AccessController#authenticate(org.apache.cocoon.environment.Request)
- */
- public boolean authenticate(Request request) throws AccessControlException {
+ public boolean authenticate(HttpServletRequest request) throws AccessControlException {
assert request != null;
boolean authenticated = getAuthenticator().authenticate(getAccreditableManager(), request);
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=741654&r1=741653&r2=741654&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 Fri Feb 6 17:55:28 2009
@@ -17,8 +17,9 @@
package org.apache.lenya.ac.impl;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.codec.binary.Base64;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccreditableManager;
@@ -32,13 +33,7 @@
*/
public class UserAuthenticator extends AbstractLogEnabled implements Authenticator {
- /**
- * @see org.apache.lenya.ac.Authenticator#authenticate(org.apache.lenya.ac.AccreditableManager,
- * org.apache.cocoon.environment.Request) Note that this implementation first checks if the
- * user has authenticated over basic HTTP authentication. If yes, it uses these
- * credentials.
- */
- public boolean authenticate(AccreditableManager accreditableManager, Request request)
+ public boolean authenticate(AccreditableManager accreditableManager, HttpServletRequest request)
throws AccessControlException {
String username = null;
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=741654&r1=741653&r2=741654&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 Fri Feb 6 17:55:28 2009
@@ -20,16 +20,13 @@
package org.apache.lenya.cms.ac;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configurable;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
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.processing.ProcessInfoProvider;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Accreditable;
@@ -41,33 +38,24 @@
import org.apache.lenya.ac.PolicyManager;
import org.apache.lenya.ac.Role;
import org.apache.lenya.ac.impl.DefaultAccessController;
-import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentUtil;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationUtil;
import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.cms.repository.RepositoryManager;
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
/**
- * A PolicyManager which is capable of mapping all URLs of a document to the
- * appropriate canonical URL, e.g. <code>/foo/bar_de.print.html</code> is
- * mapped to <code>/foo/bar</code>.
+ * A PolicyManager which is capable of mapping all URLs of a document to the appropriate canonical
+ * URL, e.g. <code>/foo/bar_de.print.html</code> is mapped to <code>/foo/bar</code>.
*/
public class DocumentPolicyManagerWrapper extends AbstractLogEnabled implements
- InheritingPolicyManager, Serviceable, Configurable, Disposable {
-
- /**
- * Ctor.
- */
- public DocumentPolicyManagerWrapper() {
- // do nothing
- }
+ InheritingPolicyManager {
private InheritingPolicyManager policyManager;
- private ServiceSelector policyManagerSelector;
+ private RepositoryManager repositoryManager;
/**
* Returns the URI which is used to obtain the policy for a webapp URL.
@@ -75,19 +63,17 @@
* @return A string.
* @throws AccessControlException when something went wrong.
*/
- protected String getPolicyURL(String webappUrl)
- throws AccessControlException {
+ protected String getPolicyURL(String webappUrl) throws AccessControlException {
return getPolicyUrlCorrect(webappUrl);
}
-
+
/**
* Returns the URI which is used to obtain the policy for a webapp URL.
* @param webappUrl The web application URL.
* @return A string.
* @throws AccessControlException when something went wrong.
*/
- protected String getPolicyUrlCorrect(String webappUrl)
- throws AccessControlException {
+ protected String getPolicyUrlCorrect(String webappUrl) throws AccessControlException {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Resolving policy for webapp URL [" + webappUrl + "]");
@@ -97,25 +83,17 @@
URLInformation info = new URLInformation(webappUrl);
String pubId = info.getPublicationId();
String area = info.getArea();
-
+
if (pubId != null && area != null && info.getDocumentUrl().length() > 1) {
- ContextUtility contextUtility = null;
try {
- contextUtility = (ContextUtility) serviceManager.lookup(ContextUtility.ROLE);
- Session session = RepositoryUtil.getSession(this.serviceManager, contextUtility
- .getRequest());
- DocumentFactory map = DocumentUtil.createDocumentFactory(this.serviceManager, session);
+ HttpServletRequest request = getRequest();
+ Session session = RepositoryUtil.getSession(getRepositoryManager(), request);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(session);
Publication pub = map.getPublication(pubId);
DocumentLocator loc = pub.getDocumentBuilder().getLocator(map, webappUrl);
url = "/" + pubId + "/" + area + loc.getPath();
- } catch (ServiceException e) {
- throw new AccessControlException("Error looking up ContextUtility component", e);
} catch (Exception e) {
throw new AccessControlException(e);
- } finally {
- if (contextUtility != null) {
- serviceManager.release(contextUtility);
- }
}
}
@@ -132,8 +110,14 @@
return url;
}
- protected String getPolicyUrlFast(String webappUrl)
- throws AccessControlException {
+ protected HttpServletRequest getRequest() {
+ ProcessInfoProvider process = (ProcessInfoProvider) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(ProcessInfoProvider.ROLE);
+ HttpServletRequest request = process.getRequest();
+ return request;
+ }
+
+ protected String getPolicyUrlFast(String webappUrl) throws AccessControlException {
String strippedUrl = strip(strip(webappUrl, '.'), '_');
return strippedUrl;
}
@@ -155,38 +139,16 @@
protected Publication getPublication(String url) throws AccessControlException {
getLogger().debug("Building publication");
- ContextUtility util = null;
try {
- util = (ContextUtility) this.serviceManager.lookup(ContextUtility.ROLE);
- Request request = util.getRequest();
- DocumentFactory factory = DocumentUtil.getDocumentFactory(this.serviceManager, request);
- return PublicationUtil.getPublicationFromUrl(this.serviceManager, factory, url);
+ Session session = RepositoryUtil.getSession(getRepositoryManager(), getRequest());
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(session);
+ String id = new URLInformation(url).getPublicationId();
+ return factory.getPublication(id);
} catch (Exception e) {
throw new AccessControlException(e);
- } finally {
- if (util != null) {
- this.serviceManager.release(util);
- }
}
}
- private ServiceManager serviceManager;
-
- /**
- * Returns the service manager.
- * @return A service manager.
- */
- protected ServiceManager getServiceManager() {
- return this.serviceManager;
- }
-
- /**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.serviceManager = manager;
- }
-
/**
* @return Returns the policyManager.
*/
@@ -248,11 +210,8 @@
try {
type = policyManagerConfiguration.getAttribute(this.ATTRIBUTE_TYPE);
- this.policyManagerSelector = (ServiceSelector) getServiceManager().lookup(
- PolicyManager.ROLE + "Selector");
-
- PolicyManager _policyManager = (PolicyManager) this.policyManagerSelector
- .select(type);
+ PolicyManager _policyManager = (PolicyManager) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(PolicyManager.ROLE + "/" + type);
if (!(_policyManager instanceof InheritingPolicyManager)) {
throw new AccessControlException("The " + getClass().getName()
@@ -266,9 +225,6 @@
} catch (final ConfigurationException e1) {
throw new ConfigurationException("Obtaining policy manager for type [" + type
+ "] failed: ", e1);
- } catch (final ServiceException e1) {
- throw new ConfigurationException("Obtaining policy manager for type [" + type
- + "] failed: ", e1);
} catch (final ParameterException e1) {
throw new ConfigurationException("Obtaining policy manager for type [" + type
+ "] failed: ", e1);
@@ -280,22 +236,6 @@
}
/**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- if (this.policyManagerSelector != null) {
- if (getPolicyManager() != null) {
- this.policyManagerSelector.release(getPolicyManager());
- }
- getServiceManager().release(this.policyManagerSelector);
- }
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Disposing [" + this + "]");
- }
-
- }
-
- /**
* @see org.apache.lenya.ac.PolicyManager#accreditableAdded(org.apache.lenya.ac.AccreditableManager,
* org.apache.lenya.ac.Accreditable)
*/
@@ -313,4 +253,12 @@
String url) throws AccessControlException {
return getPolicyManager().getGrantedRoles(accreditableManager, identity, getPolicyURL(url));
}
+
+ public void setRepositoryManager(RepositoryManager repositoryManager) {
+ this.repositoryManager = repositoryManager;
+ }
+
+ public RepositoryManager getRepositoryManager() {
+ return repositoryManager;
+ }
}
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java Fri Feb 6 17:55:28 2009
@@ -22,33 +22,48 @@
import java.io.File;
-import org.apache.avalon.framework.activity.Initializable;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.processing.ProcessInfoProvider;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceUtil;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccessController;
import org.apache.lenya.ac.impl.AbstractAccessControllerResolver;
-import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentUtil;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.cms.repository.RepositoryManager;
+import org.apache.lenya.cms.repository.RepositoryUtil;
+import org.apache.lenya.cms.repository.Session;
/**
- * Resolves the access controller according to the <code>access-control.xml</code> file of a publication.
+ * Resolves the access controller according to the <code>access-control.xml</code> file of a
+ * publication.
*/
-public class PublicationAccessControllerResolver extends AbstractAccessControllerResolver implements
- Initializable {
+public class PublicationAccessControllerResolver extends AbstractAccessControllerResolver {
- protected static final String AC_CONFIGURATION_FILE
- = "config/access-control/access-control.xml".replace('/', File.separatorChar);
+ protected static final String AC_CONFIGURATION_FILE = "config/access-control/access-control.xml"
+ .replace('/', File.separatorChar);
protected static final String TYPE_ATTRIBUTE = "type";
+ private RepositoryManager repositoryManager;
+ private SourceResolver sourceResolver;
+
+ public SourceResolver getSourceResolver() {
+ return sourceResolver;
+ }
+
+ public void setSourceResolver(SourceResolver sourceResolver) {
+ this.sourceResolver = sourceResolver;
+ }
+
/**
* This implementation uses the publication ID in combination with the context path as cache
* key.
@@ -62,8 +77,9 @@
String publicationId = info.getPublicationId();
if (getLogger().isDebugEnabled()) {
- getLogger().debug("Using first URL step (might be publication ID) as cache key: ["
- + publicationId + "]");
+ getLogger().debug(
+ "Using first URL step (might be publication ID) as cache key: ["
+ + publicationId + "]");
}
return super.generateCacheKey(publicationId, resolver);
@@ -105,20 +121,17 @@
URLInformation info = new URLInformation(webappUrl);
String pubId = info.getPublicationId();
- ContextUtility util = null;
try {
- util = (ContextUtility) this.manager.lookup(ContextUtility.ROLE);
- Request request = util.getRequest();
- DocumentFactory factory = DocumentUtil.getDocumentFactory(manager, request);
+ ProcessInfoProvider process = (ProcessInfoProvider) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(ProcessInfoProvider.ROLE);
+ HttpServletRequest request = process.getRequest();
+ Session session = RepositoryUtil.getSession(getRepositoryManager(), request);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(session);
if (pubId != null && factory.existsPublication(pubId)) {
publication = factory.getPublication(pubId);
}
} catch (Exception e) {
throw new AccessControlException(e);
- } finally {
- if (util != null) {
- this.manager.release(util);
- }
}
if (publication != null) {
getLogger().debug("Publication [" + pubId + "] exists.");
@@ -146,7 +159,8 @@
if (configurationFile.isFile()) {
try {
- Configuration configuration = new DefaultConfigurationBuilder().buildFromFile(configurationFile);
+ Configuration configuration = new DefaultConfigurationBuilder()
+ .buildFromFile(configurationFile);
return configuration;
} catch (Exception e) {
throw new AccessControlException(e);
@@ -176,8 +190,8 @@
Configuration configuration = getConfiguration(publication);
String type = configuration.getAttribute(TYPE_ATTRIBUTE);
- accessController = (AccessController) getManager().lookup(AccessController.ROLE + "/"
- + type);
+ accessController = (AccessController) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(AccessController.ROLE + "/" + type);
if (accessController instanceof Configurable) {
((Configurable) accessController).configure(configuration);
@@ -194,11 +208,10 @@
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
- SourceResolver resolver = null;
Source contextSource = null;
File contextDir;
+ SourceResolver resolver = getSourceResolver();
try {
- resolver = (SourceResolver) getManager().lookup(SourceResolver.ROLE);
contextSource = resolver.resolveURI("context:///");
contextDir = SourceUtil.getFile(contextSource);
@@ -207,14 +220,19 @@
}
} finally {
- if (resolver != null) {
- if (contextSource != null) {
- resolver.release(contextSource);
- }
- getManager().release(resolver);
+ if (contextSource != null) {
+ resolver.release(contextSource);
}
}
this.context = contextDir;
}
+ public RepositoryManager getRepositoryManager() {
+ return repositoryManager;
+ }
+
+ public void setRepositoryManager(RepositoryManager repositoryManager) {
+ this.repositoryManager = repositoryManager;
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/SslRedirectAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/SslRedirectAction.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/SslRedirectAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/SslRedirectAction.java Fri Feb 6 17:55:28 2009
@@ -33,6 +33,7 @@
import org.apache.lenya.ac.PolicyManager;
import org.apache.lenya.cms.linking.LinkRewriter;
import org.apache.lenya.cms.linking.OutgoingLinkRewriter;
+import org.apache.lenya.cms.repository.RepositoryManager;
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.util.ServletHelper;
@@ -49,6 +50,8 @@
* The key to obtain the redirect URI from the returned map.
*/
public static final String KEY_REDIRECT_URI = "redirectUri";
+
+ private RepositoryManager repositoryManager;
public Map act(Redirector redirector, SourceResolver sourceResolver, Map objectModel,
String source, Parameters parameters) throws Exception {
@@ -75,8 +78,8 @@
Policy policy = policyManager.getPolicy(accessController.getAccreditableManager(),
url);
if (policy.isSSLProtected()) {
- Session session = RepositoryUtil.getSession(this.manager, request);
- LinkRewriter rewriter = new OutgoingLinkRewriter(this.manager, session, url,
+ Session session = RepositoryUtil.getSession(getRepositoryManager(), request);
+ LinkRewriter rewriter = new OutgoingLinkRewriter(session, url,
false, true, false);
String sslUri = rewriter.rewrite(url);
return Collections.singletonMap(KEY_REDIRECT_URI, sslUri);
@@ -97,4 +100,12 @@
}
return null;
}
+
+ public void setRepositoryManager(RepositoryManager repositoryManager) {
+ this.repositoryManager = repositoryManager;
+ }
+
+ public RepositoryManager getRepositoryManager() {
+ return repositoryManager;
+ }
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/modules/ac/UserInfoTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/modules/ac/UserInfoTransformer.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/modules/ac/UserInfoTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/modules/ac/UserInfoTransformer.java Fri Feb 6 17:55:28 2009
@@ -87,7 +87,7 @@
if (name.equals(ELEM_FULLNAME)) {
String userId = this.userId != null ? this.userId : endTextRecording();
try {
- User user = PolicyUtil.getUser(this.manager, this.url, userId, getLogger());
+ User user = PolicyUtil.getUser(this.url, userId, getLogger());
String output = user != null ? user.getName() : userId;
char[] chars = output.toCharArray();
characters(chars, 0, chars.length);
Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControlUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControlUsecase.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControlUsecase.java (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControlUsecase.java Fri Feb 6 17:55:28 2009
@@ -17,7 +17,6 @@
*/
package org.apache.lenya.cms.ac.usecases;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.lenya.ac.AccessController;
import org.apache.lenya.ac.AccessControllerResolver;
import org.apache.lenya.ac.AccreditableManager;
@@ -34,18 +33,12 @@
*/
public class AccessControlUsecase extends AbstractUsecase {
- /**
- * Ctor.
- */
- public AccessControlUsecase() {
- super();
- }
-
private UserManager userManager;
private GroupManager groupManager;
private IPRangeManager ipRangeManager;
private RoleManager roleManager;
private AccessController accessController;
+ private AccessControllerResolver accessControllerResolver;
/**
* Initializes the accreditable managers. FIXME: This method resolves the
@@ -58,16 +51,10 @@
getLogger().debug("initializeAccessController() called");
this.accessController = null;
- ServiceSelector selector = null;
- AccessControllerResolver resolver = null;
try {
- selector = (ServiceSelector) this.manager.lookup(AccessControllerResolver.ROLE
- + "Selector");
- resolver = (AccessControllerResolver) selector
- .select(AccessControllerResolver.DEFAULT_RESOLVER);
- this.accessController = resolver.resolveAccessController(getSourceURL());
+ this.accessController = getAccessControllerResolver().resolveAccessController(getSourceURL());
if (this.accessController == null) {
throw new RuntimeException("No access controller could be resolved for URL ["
@@ -84,13 +71,6 @@
} catch (Exception e) {
throw new RuntimeException("Initialization failed: ", e);
- } finally {
- if (selector != null) {
- if (resolver != null) {
- selector.release(resolver);
- }
- this.manager.release(selector);
- }
}
}
@@ -148,4 +128,14 @@
}
return this.accessController;
}
+
+ protected AccessControllerResolver getAccessControllerResolver() {
+ return accessControllerResolver;
+ }
+
+ public void setAccessControllerResolver(AccessControllerResolver accessControllerResolver) {
+ this.accessControllerResolver = accessControllerResolver;
+ }
+
+
}
Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java Fri Feb 6 17:55:28 2009
@@ -17,14 +17,14 @@
*/
package org.apache.lenya.cms.ac.usecases;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
-import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.processing.ProcessInfoProvider;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.ac.Identity;
+import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationUtil;
+import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.usecase.UsecaseException;
/**
@@ -47,12 +47,12 @@
protected void initParameters() {
super.initParameters();
- Publication publication;
-
try {
- publication = PublicationUtil.getPublicationFromUrl(this.manager, getDocumentFactory(),
- getSourceURL());
- if (publication.exists()) {
+ URLInformation info = new URLInformation(getSourceURL());
+ String pubId = info.getPublicationId();
+ DocumentFactory factory = getDocumentFactory();
+ if (factory.existsPublication(pubId)) {
+ Publication publication = factory.getPublication(pubId);
setParameter(PUBLICATION, publication);
}
Identity identity = this.getSession().getIdentity();
@@ -65,13 +65,6 @@
}
/**
- * Ctor.
- */
- public Login() {
- super();
- }
-
- /**
* Validates the request parameters.
* @throws UsecaseException if an error occurs.
*/
@@ -97,8 +90,9 @@
validate();
if (!hasErrors()) {
- Map objectModel = ContextHelper.getObjectModel(getContext());
- Request request = ObjectModelHelper.getRequest(objectModel);
+ ProcessInfoProvider process = (ProcessInfoProvider) WebAppContextUtils.getCurrentWebApplicationContext()
+ .getBean(ProcessInfoProvider.ROLE);
+ HttpServletRequest request = process.getRequest();
request.getSession(true);
if (getAccessController().authenticate(request)) {
request.getSession(false).removeAttribute(HISTORY_SESSION_ATTRIBUTE);
Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java Fri Feb 6 17:55:28 2009
@@ -17,15 +17,15 @@
*/
package org.apache.lenya.cms.ac.usecases;
-import java.util.Map;
import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.cocoon.processing.ProcessInfoProvider;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.cms.repository.RepositoryUtil;
-import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
/**
* Usecase to log a user out.
@@ -35,33 +35,32 @@
public class Logout extends AccessControlUsecase {
/**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#prepareView()
*/
- protected void initParameters() {
- super.initParameters();
- Map objectModel = ContextHelper.getObjectModel(getContext());
- Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getCocoonSession(false);
+ protected void prepareView() {
+ HttpSession session = getRequest().getSession(false);
if (session != null) {
- Vector history = (Vector) session
- .getAttribute(Login.HISTORY_SESSION_ATTRIBUTE);
+ Vector history = (Vector) session.getAttribute(Login.HISTORY_SESSION_ATTRIBUTE);
setParameter("history", history.toArray());
}
}
-
+
+ protected HttpServletRequest getRequest() {
+ ProcessInfoProvider processInfo = (ProcessInfoProvider) WebAppContextUtils
+ .getCurrentWebApplicationContext().getBean(ProcessInfoProvider.ROLE);
+ return processInfo.getRequest();
+ }
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
-
- Map objectModel = ContextHelper.getObjectModel(getContext());
- Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getCocoonSession(false);
-
+ HttpServletRequest request = getRequest();
+ HttpSession session = request.getSession(false);
if (session != null) {
session.removeAttribute(Identity.class.getName());
- RepositoryUtil.removeSession(manager, request);
+ RepositoryUtil.removeSession(request);
session.removeAttribute(Login.HISTORY_SESSION_ATTRIBUTE);
}
}
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Usecases.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Usecases.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Usecases.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Usecases.java Fri Feb 6 17:55:28 2009
@@ -25,22 +25,20 @@
import org.apache.lenya.ac.Role;
import org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.usecase.UsecaseResolver;
/**
* Edit usecase policies.
*/
public class Usecases extends AccessControlUsecase {
+
+ private UsecaseResolver usecaseResolver;
protected void initParameters() {
super.initParameters();
- UsecaseResolver resolver = null;
try {
- resolver = (UsecaseResolver) this.manager.lookup(UsecaseResolver.ROLE);
- String[] allUsecases = resolver.getUsecaseNames();
+ String[] allUsecases = getUsecaseResolver().getUsecaseNames();
SortedSet rootUsecases = new TreeSet();
for (int i = 0; i < allUsecases.length; i++) {
if (allUsecases[i].indexOf("/") == -1) {
@@ -74,20 +72,10 @@
} catch (Exception e) {
throw new RuntimeException(e);
- } finally {
- if (resolver != null) {
- this.manager.release(resolver);
- }
}
}
- protected Publication getPublication() throws PublicationException {
- String pubId = new URLInformation(getSourceURL()).getPublicationId();
- Publication pub = getDocumentFactory().getPublication(pubId);
- return pub;
- }
-
protected void doExecute() throws Exception {
super.doExecute();
@@ -122,4 +110,15 @@
return this.authorizer;
}
+ protected UsecaseResolver getUsecaseResolver() {
+ return usecaseResolver;
+ }
+
+ /**
+ * TODO: Bean wiring
+ */
+ public void setUsecaseResolver(UsecaseResolver usecaseResolver) {
+ this.usecaseResolver = usecaseResolver;
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java Fri Feb 6 17:55:28 2009
@@ -22,9 +22,11 @@
import java.util.Collections;
import java.util.List;
-import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.cocoon.processing.ProcessInfoProvider;
+import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
import org.apache.lenya.ac.UserType;
@@ -41,22 +43,24 @@
protected static final String USER_TYPES = "userTypes";
protected void prepareView() throws Exception {
-
+
User[] users = getUserManager().getUsers();
List userList = new ArrayList();
userList.addAll(Arrays.asList(users));
Collections.sort(userList);
setParameter(USERS, userList);
-
- Request request = ContextHelper.getRequest(getContext());
- Session session = request.getCocoonSession(false);
+
+ ProcessInfoProvider process = (ProcessInfoProvider) WebAppContextUtils.getCurrentWebApplicationContext().getBean(
+ ProcessInfoProvider.ROLE);
+ HttpServletRequest request = process.getRequest();
+ HttpSession session = request.getSession(false);
if (session != null) {
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
if (identity != null) {
setParameter(CURRENT_USER, identity.getUser());
}
}
-
+
UserType[] types = getUserManager().getUserTypes();
setParameter(USER_TYPES, Arrays.asList(types));
}
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/publication/usecases/EditPubConf.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/publication/usecases/EditPubConf.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/publication/usecases/EditPubConf.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/publication/usecases/EditPubConf.java Fri Feb 6 17:55:28 2009
@@ -20,8 +20,6 @@
import java.io.File;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.usecase.AbstractUsecase;
/**
@@ -97,11 +95,4 @@
pub.saveConfiguration();
}
- protected Publication getPublication() throws PublicationException {
- URLInformation info = new URLInformation(getSourceURL());
- String pubId = info.getPublicationId();
- Publication pub = getDocumentFactory().getPublication(pubId);
- return pub;
- }
-
}
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java Fri Feb 6 17:55:28 2009
@@ -27,8 +27,6 @@
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.usecase.AbstractUsecase;
import org.apache.lenya.util.Assert;
@@ -41,84 +39,88 @@
protected static final Object REPORT_BROKEN_LINKS = "brokenLinks";
protected static final String PARAM_BROKEN_LINKS = "brokenLinks";
+ private LinkManager linkManager;
+ private LinkResolver linkResolver;
+
protected void prepareView() throws Exception {
super.prepareView();
-
+
final String report = getParameterAsString(PARAM_REPORT);
if (report == null) {
return;
}
-
+
if (report.equals(REPORT_BROKEN_LINKS)) {
reportBrokenLinks();
}
-
+
}
-
+
protected void reportBrokenLinks() throws Exception {
List brokenLinks = new ArrayList();
Publication pub = getPublication();
String[] areaNames = pub.getAreaNames();
- LinkManager linkManager = null;
- LinkResolver linkResolver = null;
- try {
- linkManager = (LinkManager) this.manager.lookup(LinkManager.ROLE);
- linkResolver = (LinkResolver) this.manager.lookup(LinkResolver.ROLE);
- for (int a = 0; a < areaNames.length; a++) {
- Area area = pub.getArea(areaNames[a]);
- Document[] docs = area.getDocuments();
- for (int d = 0; d < docs.length; d++) {
- Link[] links = linkManager.getLinksFrom(docs[d]);
- for (int l = 0; l < links.length; l++) {
- String uri = links[l].getUri();
- LinkTarget target = linkResolver.resolve(docs[d], uri);
- if (!target.exists()) {
- BrokenLink brokenLink = new BrokenLink(docs[d].getCanonicalWebappURL(), uri);
- brokenLinks.add(brokenLink);
- }
+ LinkManager linkManager = getLinkManager();
+ LinkResolver linkResolver = getLinkResolver();
+ for (int a = 0; a < areaNames.length; a++) {
+ Area area = pub.getArea(areaNames[a]);
+ Document[] docs = area.getDocuments();
+ for (int d = 0; d < docs.length; d++) {
+ Link[] links = linkManager.getLinksFrom(docs[d]);
+ for (int l = 0; l < links.length; l++) {
+ String uri = links[l].getUri();
+ LinkTarget target = linkResolver.resolve(docs[d], uri);
+ if (!target.exists()) {
+ BrokenLink brokenLink = new BrokenLink(docs[d].getCanonicalWebappURL(), uri);
+ brokenLinks.add(brokenLink);
}
}
}
}
- finally {
- if (linkManager != null) {
- this.manager.release(linkManager);
- }
- if (linkResolver != null) {
- this.manager.release(linkResolver);
- }
- }
setParameter(PARAM_BROKEN_LINKS, brokenLinks);
}
-
+
public static class BrokenLink {
-
+
private String sourceUrl;
private String targetUrl;
-
+
public BrokenLink(String sourceUrl, String targetUrl) {
Assert.notNull("source URL", sourceUrl);
Assert.notNull("target URL", targetUrl);
this.sourceUrl = sourceUrl;
this.targetUrl = targetUrl;
}
-
+
public String getSourceUrl() {
return this.sourceUrl;
}
-
+
public String getTargetUrl() {
return this.targetUrl;
}
}
+ protected LinkManager getLinkManager() {
+ return linkManager;
+ }
+
/**
- * @return The current publication.
- * @throws PublicationException if the usecase isn't invoked inside a publication.
+ * TODO: Bean wiring
*/
- protected Publication getPublication() throws PublicationException {
- URLInformation info = new URLInformation(getSourceURL());
- return getDocumentFactory().getPublication(info.getPublicationId());
+ public void setLinkManager(LinkManager linkManager) {
+ this.linkManager = linkManager;
+ }
+
+ protected LinkResolver getLinkResolver() {
+ return linkResolver;
}
-
+
+ /**
+ * TODO: Bean wiring
+ */
+ public void setLinkResolver(LinkResolver linkResolver) {
+ this.linkResolver = linkResolver;
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/AccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/AccessController.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/AccessController.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/AccessController.java Fri Feb 6 17:55:28 2009
@@ -18,6 +18,8 @@
package org.apache.lenya.ac;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.environment.Request;
@@ -48,7 +50,7 @@
* @return A boolean value.
* @throws AccessControlException when something went wrong.
*/
- boolean authenticate(Request request) throws AccessControlException;
+ boolean authenticate(HttpServletRequest request) throws AccessControlException;
/**
* Authorizes a request inside a publication.
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Authenticator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Authenticator.java?rev=741654&r1=741653&r2=741654&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Authenticator.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Authenticator.java Fri Feb 6 17:55:28 2009
@@ -18,8 +18,9 @@
package org.apache.lenya.ac;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.environment.Request;
/**
* An authenticator.
@@ -39,6 +40,6 @@
* @return <code>true</code> if the request is authenticated, <code>false</code> otherwise.
* @throws AccessControlException when something went wrong.
*/
- boolean authenticate(AccreditableManager accreditableManager, Request request)
+ boolean authenticate(AccreditableManager accreditableManager, HttpServletRequest request)
throws AccessControlException;
}