svn commit: r1073180 [1/4] - in /lenya/trunk: ./ org.apache.lenya.core.ac/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/ org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/ org.apache.lenya.core.administration...
[email protected] Mon, 21 Feb 2011 23:06:18 -0000
| Newsgroups | gmane.comp.cms.lenya.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: florent
Date: Mon Feb 21 23:06:11 2011
New Revision: 1073180
URL: http://svn.apache.org/viewvc?rev=1073180&view=rev
Log:
- work on create more unique responsability components
- api modules compile, but not all implementation
- the main blockers are sessions (for publication and respository) : this sessions create strong and cyclic dependencies between publication and repository
- will try now to remove this component specific sessions
Added:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/Schema.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/AccessControlException.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/AccessControlException.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Accreditable.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Accreditable.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/AccreditableManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/AccreditableManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Group.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Group.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/GroupManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/GroupManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Groupable.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Groupable.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/IPRange.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/IPRange.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/IPRangeManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/IPRangeManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identifiable.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identifiable.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identity.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identity.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Item.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Item.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/ItemManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/ItemManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/ItemManagerListener.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/ItemManagerListener.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Machine.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Machine.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Role.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Role.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/RoleManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/RoleManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/User.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/User.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/UserManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/UserManager.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/UserType.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/UserType.java
lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/World.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/World.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/SchemaImpl.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java
lenya/trunk/org.apache.lenya.core.metadata.cocoon/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/pom.xml
lenya/trunk/org.apache.lenya.core.metadata.cocoon/rcl.properties
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/apache/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/apache/lenya/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/apache/lenya/cms/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/apache/lenya/cms/cocoon/
- copied from r1072031, lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/cocoon/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/java/org/apache/lenya/modules/
- copied from r1072031, lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/modules/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/resources/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/resources/COB-INF/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/test/
lenya/trunk/org.apache.lenya.core.metadata.cocoon/src/test/java/
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRcmlFactory.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRcmlFactory.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationException.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/ObservationException.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationRegistry.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/ObservationRegistry.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteManager.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteManager.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/
- copied from r1072031, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
- copied unchanged from r1072031, lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/
- copied from r1072031, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/
lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java
- copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java
lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/LockException.java
- copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockException.java
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/utils/test/
- copied from r1038385, lenya/trunk/org.apache.lenya.core.utils/src/test/java/org/apache/lenya/utils/test/
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/flow/
- copied from r1072031, lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/flow/
lenya/trunk/org.apache.lenya.deprecated/src/main/java/org/apache/lenya/cms/publication/Revision.java
- copied, changed from r1072031, lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Revision.java
Removed:
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/AccessControlException.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Accreditable.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/AccreditableManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Group.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/GroupManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Groupable.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/IPRange.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/IPRangeManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identifiable.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identity.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Item.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/ItemManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/ItemManagerListener.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Machine.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Role.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/RoleManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/User.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/UserManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/UserType.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/World.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/flow/
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/util/ServletHelper.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/cocoon/
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/usecases/
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/modules/
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryEventFactory.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/RepositoryLogger.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Revision.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/Link.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/SiteException.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/SiteManager.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/SiteNode.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/SiteStructure.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/usecases/
lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/ConcurrentModificationException.java
lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockException.java
lenya/trunk/org.apache.lenya.core.utils/src/test/java/org/apache/lenya/utils/test/
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ContentSourceWrapper.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeHistory.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRcmlFactory.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
Modified:
lenya/trunk/org.apache.lenya.core.ac/pom.xml
lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/ChangePassword.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/SessionViewer.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/modules/administration/Reports.java
lenya/trunk/org.apache.lenya.core.cache/pom.xml
lenya/trunk/org.apache.lenya.core.cocoon/pom.xml
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutTestAction.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/org.apache.lenya.core.document.impl/pom.xml
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java
lenya/trunk/org.apache.lenya.core.impl/pom.xml
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/ValidationUtil.java
lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
lenya/trunk/org.apache.lenya.core.impl/src/test/resources/test-components.xml
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/UuidToUrlModule.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/linking/LinkConverter.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolver.java
lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.java
lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementSetWrapper.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementWrapper.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryWrapper.java
lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataWrapper.java
lenya/trunk/org.apache.lenya.core.observation/pom.xml
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.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/org.apache.lenya.core.publication.impl/pom.xml
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/HistoryWrapper.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PageEnvelopeFactory.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/RevisionWrapper.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/SingleLanguageIdentityMapper.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/TransactionLock.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/DocumentHelper.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/LanguageVersions.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/AbstractLink.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/site/NodeSet.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DefaultDocumentTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DocumentFactoryTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DocumentLocatorTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DocumentManagerTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/DublinCoreTest.java
lenya/trunk/org.apache.lenya.core.publication.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java
lenya/trunk/org.apache.lenya.core.repository.api/pom.xml
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Revision.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Session.java
lenya/trunk/org.apache.lenya.core.repository.impl/pom.xml
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/publication/RepositoryImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/FileReservedCheckOutException.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryManagerImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SessionImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStoreImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/metadata/impl/ConfigurableElementSet.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/metadata/impl/ElementImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/metadata/impl/MetaDataRegistryImpl.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/MockFactory.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/MockRevisionController.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/MockTransactionable.java
lenya/trunk/org.apache.lenya.core.repository.impl/src/test/java/org/apache/lenya/transaction/TransactionTest.java
lenya/trunk/org.apache.lenya.core.resourcetype/pom.xml
lenya/trunk/org.apache.lenya.core.resourcetype/src/main/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml
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/EmptyTrash.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.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.transaction.api/src/main/java/org/apache/lenya/transaction/Identity.java
lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml
lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/cms/publication/IdentityWrapper.java
lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.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/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/DocumentUsecase.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/scheduling/impl/UsecaseSchedulerImpl.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js
lenya/trunk/org.apache.lenya.core.usecase/src/test/java/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java
lenya/trunk/org.apache.lenya.core.utils/src/main/java/org/apache/lenya/utils/ServletHelper.java
lenya/trunk/org.apache.lenya.core.workflow/pom.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.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/MultiWorkflow.java
lenya/trunk/org.apache.lenya.deprecated/src/main/java/org/apache/lenya/cms/repository/metadata/ElementSet.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.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.lucene/pom.xml
lenya/trunk/org.apache.lenya.module.notification/pom.xml
lenya/trunk/org.apache.lenya.module.simplesite/pom.xml
lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
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/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml
lenya/trunk/org.apache.lenya.module.svg/pom.xml
lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp/pom.xml
lenya/trunk/org.apache.lenya.webapp/rcl.properties
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=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.ac/pom.xml Mon Feb 21 23:06:11 2011
@@ -43,6 +43,10 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-repository-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-identity</artifactId>
+ </dependency>
<!-- TODO : see if theses dependencies are required -->
<dependency>
<groupId>javax.servlet</groupId>
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=1073180&r1=1073179&r2=1073180&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 Mon Feb 21 23:06:11 2011
@@ -52,9 +52,12 @@ public class Login extends AccessControl
Publication publication = getSession().getPublication(pubId);
setParameter(PUBLICATION, publication);
}
- Identity identity = this.getSession().getIdentity();
+ //florent : Identity identity = this.getSession().getIdentity();
+ Identity identity = Identity.getIdentity(this.request.getSession(false));
if (identity != null && identity.getUser() != null) {
- setParameter(CURRENT_USER, this.getSession().getIdentity().getUser());
+ //florent : use the just define identity, move when ok
+ //setParameter(CURRENT_USER, this.getSession().getIdentity().getUser());
+ setParameter(CURRENT_USER, identity.getUser());
}
} catch (Exception e) {
throw new RuntimeException(e);
@@ -87,13 +90,17 @@ public class Login extends AccessControl
validate();
if (!hasErrors()) {
+ //TODO : remove this part for retrive the request and use the other technique for identity as the request is in the abstract
+ //usecase now
HttpServletRequest request = ServletHelper.getRequest();
request.getSession(true);
if (getAccessController().authenticate(request)) {
//we have an authenticated user, so we create a modifiable repository session
Identity identity = (Identity) request.getSession().getAttribute(Identity.class.getName());
- Session s = this.repository.startSession(identity, true);
+ //florent : see if ok, startsession remove from repository
+ //Session s = this.repository.startSession(identity, true);
+ Session s = this.repository.getSession(this.request);
this.setSession(s);
//TODO : see if this remove attribute is still valid
request.getSession(false).removeAttribute(HISTORY_SESSION_ATTRIBUTE);
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AccessControl.java Mon Feb 21 23:06:11 2011
@@ -27,7 +27,8 @@ import java.util.TreeSet;
import org.apache.cocoon.ProcessingException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.URLInformation;
+//florent : import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.utils.URLInformation;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Accreditable;
@@ -86,7 +87,8 @@ public class AccessControl extends Acces
super.initParameters();
try {
- URLInformation info = new URLInformation(getSourceURL());
+ //URLInformation info = new URLInformation(getSourceURL());
+ URLInformation info = new URLInformation();
setParameter(COMPLETE_AREA, info.getCompleteArea());
if (getSession().getUriHandler().isDocument(getSourceURL())) {
@@ -150,7 +152,8 @@ public class AccessControl extends Acces
*/
protected void doCheckPreconditions() throws Exception {
super.doCheckPreconditions();
- URLInformation info = new URLInformation(getSourceURL());
+ //URLInformation info = new URLInformation(getSourceURL());
+ URLInformation info = new URLInformation();
String acArea = getParameterAsString(AC_AREA);
if (!acArea.equals(Publication.LIVE_AREA) && !info.getArea().equals(acArea)) {
addErrorMessage("This usecase can only be invoked in the configured area.");
@@ -449,7 +452,8 @@ public class AccessControl extends Acces
protected String getPolicyURL() {
String infoUrl = getSourceURL();
- URLInformation info = new URLInformation(infoUrl);
+ //URLInformation info = new URLInformation(infoUrl);
+ URLInformation info = new URLInformation();
String area = getParameterAsString(AC_AREA);
String url = "/" + info.getPublicationId() + "/" + area + info.getDocumentUrl();
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/ChangePassword.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/ChangePassword.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/ChangePassword.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/ChangePassword.java Mon Feb 21 23:06:11 2011
@@ -18,6 +18,7 @@
package org.apache.lenya.cms.ac.usecases;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.Identity;
/**
* Usecase to change a user's password. The old password is checked.
@@ -30,7 +31,10 @@ public class ChangePassword extends Abst
* @return Always returns the currently logged in user.
*/
protected User getUser() {
- return getSession().getIdentity().getUser();
+
+ return Identity.getIdentity(this.request.getSession(false)).getUser();
+ //florent: modifications due to session interface changes
+ //return getSession().getIdentity().getUser();
}
/**
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/SessionViewer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/SessionViewer.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/SessionViewer.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/SessionViewer.java Mon Feb 21 23:06:11 2011
@@ -29,7 +29,9 @@ import javax.servlet.http.*;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.ac.usecases.AccessControlUsecase;
-import org.apache.lenya.cms.publication.URLInformation;
+//florent
+//import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.utils.URLInformation;
import org.apache.lenya.modules.monitoring.SessionListener;
/**
@@ -99,7 +101,8 @@ public class SessionViewer extends Acces
* @return The publicationID from an URL.
*/
private String getPublicationIDfromURL() {
- URLInformation info = new URLInformation(getSourceURL());
+ //florent : URLInformation info = new URLInformation(getSourceURL());
+ URLInformation info = new URLInformation();
return info.getPublicationId();
}
}
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=1073180&r1=1073179&r2=1073180&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 Mon Feb 21 23:06:11 2011
@@ -69,7 +69,9 @@ public class Reports extends AbstractUse
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);
+ //florent : change due to change in linkResolver
+ //LinkTarget target = linkResolver.resolve(docs[d], uri);
+ LinkTarget target = linkResolver.resolve(getSession(),docs[d], uri);
if (!target.exists()) {
BrokenLink brokenLink = new BrokenLink(docs[d].getCanonicalWebappURL(), uri);
brokenLinks.add(brokenLink);
Copied: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/Schema.java (from r1034526, lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/Schema.java?p2=lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/Schema.java&p1=lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java&r1=1034526&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/Schema.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/xml/Schema.java Mon Feb 21 23:06:11 2011
@@ -1,73 +1,16 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
package org.apache.lenya.xml;
-/**
- * Validation schema.
- */
-public class Schema {
+public interface Schema {
- /**
- * Ctor.
- * @param language The language, as defined by
- * org.apache.cocoon.components.validation.Validator.
- * @param schemaUri The schema URI.
- * @see org.apache.cocoon.components.validation.Validator
- */
- public Schema(String language, String schemaUri) {
- this.language = language;
- this.uri = schemaUri;
- }
+ /**
+ * @return The language.
+ * @see org.apache.cocoon.components.validation.Validator
+ */
+ public abstract String getLanguage();
+
+ /**
+ * @return The URI to read the schema from.
+ */
+ public abstract String getURI();
- private String language;
-
- private String uri;
-
- /**
- * @return The language.
- * @see org.apache.cocoon.components.validation.Validator
- */
- public String getLanguage() {
- return this.language;
- }
-
- /**
- * @return The URI to read the schema from.
- */
- public String getURI() {
- return this.uri;
- }
-
-}
+}
\ No newline at end of file
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=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cache/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.cache/pom.xml Mon Feb 21 23:06:11 2011
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-api</artifactId>
+ <artifactId>lenya-core-impl</artifactId>
</dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/pom.xml Mon Feb 21 23:06:11 2011
@@ -24,6 +24,26 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-publication-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-publication-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-document-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-utils</artifactId>
+ </dependency>
<!-- TODO : see if all theses dependencies are required -->
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java Mon Feb 21 23:06:11 2011
@@ -31,7 +31,7 @@ import org.apache.cocoon.environment.Req
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.publication.Repository;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* Action that checks if the current URL represents an existing document.
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java Mon Feb 21 23:06:11 2011
@@ -32,7 +32,7 @@ import org.apache.lenya.ac.Identity;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Repository;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* Checkin document
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java Mon Feb 21 23:06:11 2011
@@ -27,7 +27,7 @@ import org.apache.avalon.framework.param
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.RepositoryException;
+import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.publication.Session;
/**
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutTestAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutTestAction.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutTestAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutTestAction.java Mon Feb 21 23:06:11 2011
@@ -27,7 +27,8 @@ import org.apache.avalon.framework.param
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.RepositoryException;
+//import org.apache.lenya.cms.publication.RepositoryException;
+import org.apache.lenya.cms.repository.RepositoryException;
/**
* An action that tests if a document is already checked out by a given user. If it isn't, a check
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Mon Feb 21 23:06:11 2011
@@ -37,7 +37,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.Repository;
import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* Revision controller action.
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java Mon Feb 21 23:06:11 2011
@@ -29,7 +29,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.PageEnvelopeFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
import org.apache.lenya.utils.URLInformation;
/**
* Abstract superclass for classes which need access to the page envelope.
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/FallbackModule.java Mon Feb 21 23:06:11 2011
@@ -35,7 +35,7 @@ import org.apache.lenya.cms.cocoon.sourc
import org.apache.lenya.cms.publication.Repository;
import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* <p>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java Mon Feb 21 23:06:11 2011
@@ -34,7 +34,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.publication.ResourceTypeResolver;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* <p>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/AggregatingFallbackSourceFactory.java Mon Feb 21 23:06:11 2011
@@ -35,7 +35,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.publication.templating.AllExistingSourceResolver;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* <p>
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java Mon Feb 21 23:06:11 2011
@@ -36,12 +36,14 @@ import org.apache.excalibur.store.impl.M
import org.apache.lenya.cms.module.Module;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.Repository;
-import org.apache.lenya.cms.publication.Session;
+//florent import org.apache.lenya.cms.publication.Session;
+import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.publication.templating.ExistingSourceResolver;
import org.apache.lenya.cms.publication.templating.PublicationTemplateManager;
import org.apache.lenya.cms.publication.templating.VisitingSourceResolver;
-import org.apache.lenya.util.ServletHelper;
+//florent import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* <p>
@@ -53,7 +55,6 @@ import org.apache.lenya.util.ServletHelp
* this is necessary as a workaround for bug 40564.
* </p>
*
- * @version $Id$
*/
public class FallbackSourceFactory extends AbstractLogEnabled implements SourceFactory,
URIAbsolutizer {
@@ -156,9 +157,11 @@ public class FallbackSourceFactory exten
protected String getPublicationId() {
final ProcessInfoProvider processInfo = (ProcessInfoProvider) WebAppContextUtils
.getCurrentWebApplicationContext().getBean(ProcessInfoProvider.ROLE);
- HttpServletRequest request = processInfo.getRequest();
+ /*florent HttpServletRequest request = processInfo.getRequest();
String webappUri = ServletHelper.getWebappURI(request);
- URLInformation info = new URLInformation(webappUri);
+ URLInformation info = new URLInformation(webappUri);*/
+ HttpServletRequest request = processInfo.getRequest();
+ URLInformation info = new URLInformation();
String pubId = null;
try {
Session session = this.repository.getSession(request);
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java Mon Feb 21 23:06:11 2011
@@ -38,7 +38,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.repository.NodeFactory;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* A factory for the "lenyadoc" scheme (virtual protocol), which is used to resolve any
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java Mon Feb 21 23:06:11 2011
@@ -44,15 +44,14 @@ import org.apache.excalibur.source.impl.
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.repository.ContentHolder;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.repository.SessionHolder;
import org.apache.lenya.util.Query;
-import org.apache.lenya.util.ServletHelper;
-
+import org.apache.lenya.utils.ServletHelper;
+import org.apache.lenya.utils.URLInformation;
/**
* Repository source.
*
Modified: lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.cocoon/src/main/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java Mon Feb 21 23:06:11 2011
@@ -37,7 +37,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.site.SiteStructure;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.ServletHelper;
/**
* <p>
Modified: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/Document.java Mon Feb 21 23:06:11 2011
@@ -53,6 +53,38 @@ public interface Document extends Node,
String TRANSACTIONABLE_TYPE = "document";
/**
+ * The meta data namespace.
+ */
+ public static final String METADATA_NAMESPACE = "http://apache.org/lenya/metadata/document/1.0";
+
+ /**
+ * The name of the resource type attribute. A resource has a resource type; this information can
+ * be used e.g. for different rendering of different types.
+ */
+ public static final String METADATA_RESOURCE_TYPE = "resourceType";
+
+ /**
+ * The name of the mime type attribute.
+ */
+ public static final String METADATA_MIME_TYPE = "mimeType";
+
+ /**
+ * The name of the content type attribute. Any content managed by Lenya has a type; this
+ * information can be used e.g. to provide an appropriate management interface.
+ */
+ public static final String METADATA_CONTENT_TYPE = "contentType";
+
+ /**
+ * The number of seconds from the request that a document can be cached before it expires
+ */
+ public static final String METADATA_EXPIRES = "expires";
+
+ /**
+ * The extension to use for the document source.
+ */
+ public static final String METADATA_EXTENSION = "extension";
+
+ /**
* <code>DOCUMENT_META_SUFFIX</code> The suffix for document meta Uris
*/
final String DOCUMENT_META_SUFFIX = ".meta";
@@ -143,7 +175,7 @@ public interface Document extends Node,
*
* @return true if the document exists, false otherwise
*/
- boolean exists();
+ boolean exists() throws DocumentException;
/**
* Check if a document exists with the given document-uuid and the given area
Added: lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java?rev=1073180&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java (added)
+++ lenya/trunk/org.apache.lenya.core.document.api/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java Mon Feb 21 23:06:11 2011
@@ -0,0 +1,88 @@
+package org.apache.lenya.cms.publication;
+
+/**
+ * A DocumentLocator describes a document based on its path in the site structure. The actual
+ * document doesn't have to exist.
+ * It helps to locate a document inside a publication
+ */
+public interface DocumentLocator {
+
+ /**
+ * @return The area of the document.
+ */
+ public abstract String getArea();
+
+ /**
+ * @return The language of the document.
+ */
+ public abstract String getLanguage();
+
+ /**
+ * @return The path of the document in the site structure.
+ */
+ public abstract String getPath();
+
+ /**
+ * @return The publication ID.
+ */
+ public abstract String getPublicationId();
+
+ /**
+ * Returns a locator with the same publication ID, area, and language, but a different path in
+ * the site structure.
+ * @param path The path.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getPathVersion(String path);
+
+ /**
+ * Returns a descendant of this locator.
+ * @param relativePath The relative path which must not begin with a slash and must not be
+ * empty.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getDescendant(String relativePath);
+
+ /**
+ * Returns a child of this locator.
+ * @param step The relative path to the child, it must not contain a slash.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getChild(String step);
+
+ /**
+ * Returns the parent of this locator.
+ * @return A document locator or <code>null</code> if this is the root locator.
+ */
+ public abstract DocumentLocator getParent();
+
+ /**
+ * Returns the parent of this locator.
+ * @param defaultPath The path of the locator to return if this is the root locator.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getParent(String defaultPath);
+
+ /**
+ * Returns a locator with the same publication ID, area, and path, but with a different
+ * language.
+ * @param language The language.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getLanguageVersion(String language);
+
+ public abstract boolean equals(Object obj);
+
+ public abstract int hashCode();
+
+ public abstract String toString();
+
+ /**
+ * Returns a locator with the same publication ID, path, and language, but with a different
+ * area.
+ * @param area The area.
+ * @return A document locator.
+ */
+ public abstract DocumentLocator getAreaVersion(String area);
+
+}
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.core.document.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/pom.xml Mon Feb 21 23:06:11 2011
@@ -20,27 +20,31 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-document-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-utils</artifactId>
+ </dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.apache.lenya</groupId> -->
- <!-- <artifactId>lenya-core-api</artifactId> -->
- <!-- </dependency> -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-publication-api</artifactId>
+ </dependency>
<!-- <dependency> -->
<!-- <groupId>org.apache.lenya</groupId> -->
<!-- <artifactId>lenya-core-impl</artifactId> -->
<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.lenya</groupId> -->
-<!-- <artifactId>lenya-core-metadata</artifactId> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata-impl</artifactId>
+ </dependency>
<!-- <dependency> -->
<!-- <groupId>org.apache.lenya</groupId> -->
<!-- <artifactId>lenya-core-sitemanagement</artifactId> -->
<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.lenya</groupId> -->
-<!-- <artifactId>lenya-core-repository-api</artifactId> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository-api</artifactId>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.cocoon</groupId>-->
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryImpl.java Mon Feb 21 23:06:11 2011
@@ -30,7 +30,7 @@ import org.apache.lenya.cms.repository.R
import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.RepositoryItemFactory;
import org.apache.lenya.cms.repository.SessionHolder;
-
+import org.apache.lenya.utils.URLInformation;
/**
* A DocumentIdentityMap avoids the multiple instanciation of a document object.
*
@@ -191,7 +191,8 @@ public class DocumentFactoryImpl impleme
public boolean isDocument(String webappUrl) throws ResourceNotFoundException {
Validate.notNull(webappUrl);
try {
- URLInformation info = new URLInformation(webappUrl);
+ //florent URLInformation info = new URLInformation(webappUrl);
+ URLInformation info = new URLInformation();
String pubId = info.getPublicationId();
String[] pubIds = getPublicationIds();
if (pubId != null && Arrays.asList(pubIds).contains(pubId)) {
@@ -248,7 +249,8 @@ public class DocumentFactoryImpl impleme
protected DocumentLocator getLocator(String webappUrl) {
DocumentLocator locator;
try {
- URLInformation info = new URLInformation(webappUrl);
+ //florent URLInformation info = new URLInformation(webappUrl);
+ URLInformation info = new URLInformation();
Publication publication = getPublication(info.getPublicationId());
DocumentBuilder builder = publication.getDocumentBuilder();
locator = builder.getLocator(this.session, webappUrl);
@@ -338,11 +340,11 @@ public class DocumentFactoryImpl impleme
private PublicationManager pubManager;
- protected void setPublicationManager(PublicationManager pubManager) {
+ public void setPublicationManager(PublicationManager pubManager) {
this.pubManager = pubManager;
}
- protected PublicationManager getPublicationManager() {
+ public PublicationManager getPublicationManager() {
return this.pubManager;
}
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentImpl.java Mon Feb 21 23:06:11 2011
@@ -21,9 +21,11 @@ package org.apache.lenya.cms.publication
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,16 +39,18 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.repository.ContentHolder;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
+import org.apache.lenya.cms.repository.Persistable;
import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.repository.SessionHolder;
+import org.apache.lenya.cms.repository.RepositoryException;
+import org.apache.lenya.cms.repository.History;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteStructure;
/**
* A typical CMS document.
- * @version $Id$
*/
public class DocumentImpl implements Document, RepositoryItem {
@@ -58,37 +62,38 @@ public class DocumentImpl implements Doc
private ResourceTypeResolver resourceTypeResolver;
private int revision = -1;
+ //florent : extract propertie from document impl to document (api)
/**
* The meta data namespace.
*/
- public static final String METADATA_NAMESPACE = "http://apache.org/lenya/metadata/document/1.0";
+ // public static final String METADATA_NAMESPACE = "http://apache.org/lenya/metadata/document/1.0";
/**
* The name of the resource type attribute. A resource has a resource type; this information can
* be used e.g. for different rendering of different types.
*/
- protected static final String METADATA_RESOURCE_TYPE = "resourceType";
+ //protected static final String METADATA_RESOURCE_TYPE = "resourceType";
/**
* The name of the mime type attribute.
*/
- protected static final String METADATA_MIME_TYPE = "mimeType";
+ //protected static final String METADATA_MIME_TYPE = "mimeType";
/**
* The name of the content type attribute. Any content managed by Lenya has a type; this
* information can be used e.g. to provide an appropriate management interface.
*/
- protected static final String METADATA_CONTENT_TYPE = "contentType";
+ //protected static final String METADATA_CONTENT_TYPE = "contentType";
/**
* The number of seconds from the request that a document can be cached before it expires
*/
- protected static final String METADATA_EXPIRES = "expires";
+ //protected static final String METADATA_EXPIRES = "expires";
/**
* The extension to use for the document source.
*/
- protected static final String METADATA_EXTENSION = "extension";
+ //protected static final String METADATA_EXTENSION = "extension";
/**
* Creates a new instance of DefaultDocument.
@@ -98,7 +103,7 @@ public class DocumentImpl implements Doc
*/
protected DocumentImpl(org.apache.lenya.cms.publication.Session session,
DocumentIdentifier identifier, int revision) {
-
+
if (logger.isDebugEnabled()) {
logger.debug("DefaultDocument() creating new instance with id [" + identifier.getUUID()
+ "], language [" + identifier.getLanguage() + "]");
@@ -275,17 +280,15 @@ public class DocumentImpl implements Doc
this.extension = _extension;
}
- public boolean exists() throws ResourceNotFoundException {
+ public boolean exists()throws DocumentException{
try {
return getRepositoryNode().exists();
} catch (org.apache.lenya.cms.repository.RepositoryException e) {
- throw new ResourceNotFoundException(e);
+ throw new DocumentException(e);
}
}
- //florent : seems never use, imply cyclic dependencies
- /*
- public boolean existsInAnyLanguage() throws ResourceNotFoundException {
+ public boolean existsInAnyLanguage() {
String[] languages = getLanguages();
if (languages.length > 0) {
@@ -311,7 +314,7 @@ public class DocumentImpl implements Doc
return false;
}
- }*/
+ }
public DocumentIdentifier getIdentifier() {
return this.identifier;
@@ -420,7 +423,7 @@ public class DocumentImpl implements Doc
MetaData meta;
try {
meta = new MetaDataWrapper(getContentHolder().getMetaData(namespaceUri));
- } catch (org.apache.lenya.cms.repository.metadata.MetaDataException e) {
+ } catch (org.apache.lenya.cms.metadata.MetaDataException e) {
throw new MetaDataException(e);
}
if (getRepositorySession().isModifiable()) {
@@ -439,7 +442,7 @@ public class DocumentImpl implements Doc
public String[] getMetaDataNamespaceUris() throws MetaDataException {
try {
return getContentHolder().getMetaDataNamespaceUris();
- } catch (org.apache.lenya.cms.repository.metadata.MetaDataException e) {
+ } catch (org.apache.lenya.cms.metadata.MetaDataException e) {
throw new MetaDataException(e);
}
}
@@ -480,7 +483,7 @@ public class DocumentImpl implements Doc
+ "] is not referenced in the site structure.");
}
try {
- return DocumentLocator.getLocator(getPublication().getId(), getArea(), structure
+ return DocumentLocatorImpl.getLocator(getPublication().getId(), getArea(), structure
.getByUuid(getUUID(), getLanguage()).getNode().getPath(), getLanguage());
} catch (SiteException e) {
throw new RuntimeException(e);
@@ -490,9 +493,7 @@ public class DocumentImpl implements Doc
public String getPath() throws DocumentException {
return getLink().getNode().getPath();
}
-
- //florent : seems never use, imply cyclic dependencies
- /*
+
public boolean existsAreaVersion(String area) {
String sourceUri = getSourceURI(getPublication(), area, getUUID(), getLanguage());
try {
@@ -500,17 +501,15 @@ public class DocumentImpl implements Doc
} catch (Exception e) {
throw new RuntimeException(e);
}
- }*/
+ }
public boolean existsTranslation(String language) {
return area().contains(getUUID(), language);
}
- //florent : seems never use, imply cyclic dependencies
- /*
public Document getAreaVersion(String area) throws ResourceNotFoundException {
return getPublication().getArea(area).getDocument(getUUID(), getLanguage());
- }*/
+ }
public Document getTranslation(String language) throws ResourceNotFoundException {
return area().getDocument(getUUID(), language);
@@ -561,8 +560,7 @@ public class DocumentImpl implements Doc
return pub.getContentUri(area) + "/" + path;
}
- //florent : seems never use, imply cyclic dependencies
- /*
+
public boolean existsVersion(String area, String language) {
String sourceUri = getSourceURI(getPublication(), area, getUUID(), language);
try {
@@ -570,7 +568,7 @@ public class DocumentImpl implements Doc
} catch (Exception e) {
throw new RuntimeException(e);
}
- }*/
+ }
public Document getVersion(String area, String language) throws ResourceNotFoundException {
return getPublication().getArea(area).getDocument(getUUID(), language);
@@ -594,11 +592,9 @@ public class DocumentImpl implements Doc
return area().getSite().containsByUuid(getUUID(), getLanguage());
}
- //florent : seems never use, imply cyclic dependencies
- /*
public Area area() {
return getPublication().getArea(getArea());
- }*/
+ }
public void setResourceType(ResourceType resourceType) {
Validate.notNull(resourceType);
@@ -751,7 +747,8 @@ public class DocumentImpl implements Doc
public History getHistory() {
if (this.history == null) {
- this.history = new HistoryWrapper(getRepositoryNode().getHistory());
+ //florent : wrapper not still usefull this.history = new HistoryWrapper(getRepositoryNode().getHistory());
+ this.history = getRepositoryNode().getHistory();
}
return this.history;
}
@@ -761,8 +758,13 @@ public class DocumentImpl implements Doc
return false;
}
- public Document getRevision(int i) {
+ public Document getRevision(int i) throws RepositoryException{
+ try{
return area().getDocument(getUUID(), getLanguage(), i);
+ }
+ catch (ResourceNotFoundException rnfe){
+ throw new RepositoryException(rnfe);
+ }
}
public void forceCheckIn() throws RepositoryException {
@@ -793,4 +795,39 @@ public class DocumentImpl implements Doc
this.resourceTypeResolver = resourceTypeResolver;
}
+ /*** BEGIN unimplemented methods **/
+ //Florent :
+ //This methods come from the remove of o.a.l.cms.publication.Node and the use of o.a.l.cms.repository.Node
+
+ public boolean isCollection() throws RepositoryException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public Collection getChildren() throws RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void copyRevisionsFrom(Node source) throws RepositoryException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void registerRemoved() throws RepositoryException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setPersistable(Persistable persistable)
+ throws RepositoryException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Persistable getPersistable() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ /*** END unimplemented methods **/
}
\ No newline at end of file