You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/08/11 16:11:38 UTC
svn commit: r430795 - in /lenya/trunk/src:
impl/test/org/apache/lenya/ac/impl/ impl/test/org/apache/lenya/cms/metadata/
impl/test/org/apache/lenya/cms/publication/
impl/test/org/apache/lenya/cms/publication/file/
impl/test/org/apache/lenya/cms/publicat...
Author: andreas
Date: Fri Aug 11 07:11:34 2006
New Revision: 430795
URL: http://svn.apache.org/viewvc?rev=430795&view=rev
Log:
Renamed ...identityMap to ...factory
Modified:
lenya/trunk/src/impl/test/org/apache/lenya/ac/impl/AbstractAccessControlTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DocumentFactoryTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DublinCoreTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/TestPageEnvelope.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/site/simple/SimpleSiteManagerTest.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyUrlModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/LenyaMetaDataGenerator.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentUtil.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentHelper.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
lenya/trunk/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java
lenya/trunk/src/modules-core/observation-impl/java/src/org/apache/lenya/cms/observation/ObservationManager.java
lenya/trunk/src/modules-core/observation-impl/java/test/org/apache/lenya/cms/observation/ObservationTest.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/src/modules/lenyadoc/java/src/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
lenya/trunk/src/modules/linkcheck/java/src/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java
lenya/trunk/src/modules/lucene/java/test/org/apache/lenya/cms/lucene/IndexUpdaterTest.java
lenya/trunk/src/modules/migration/java/test/org/apache/lenya/cms/migration/MigrateUuidsTest.java
lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java
lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/site/usecases/ResourceLinkRewriterTest.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogGenerator.java
lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogOverviewGenerator.java
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
Modified: lenya/trunk/src/impl/test/org/apache/lenya/ac/impl/AbstractAccessControlTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/ac/impl/AbstractAccessControlTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/ac/impl/AbstractAccessControlTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/ac/impl/AbstractAccessControlTest.java Fri Aug 11 07:11:34 2006
@@ -175,18 +175,18 @@
return accrMgr.getConfigurationDirectory();
}
- private DocumentFactory identityMap;
+ private DocumentFactory factory;
- protected DocumentFactory getIdentityMap() {
- if (this.identityMap == null) {
+ protected DocumentFactory getFactory() {
+ if (this.factory == null) {
org.apache.lenya.cms.repository.Session session;
try {
session = RepositoryUtil.getSession(getManager(), getRequest());
} catch (Exception e) {
throw new RuntimeException(e);
}
- this.identityMap = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ this.factory = DocumentUtil.createDocumentFactory(getManager(), session);
}
- return this.identityMap;
+ return this.factory;
}
}
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java Fri Aug 11 07:11:34 2006
@@ -37,7 +37,7 @@
*/
public void testMetaData() throws Exception {
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication publication = PublicationUtil.getPublication(getManager(), "test");
Document doc = factory.get(publication, Publication.AUTHORING_AREA, "/index", "en");
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java Fri Aug 11 07:11:34 2006
@@ -32,6 +32,6 @@
*/
protected Document getDocument(DocumentTestSet set) throws PublicationException {
Publication pub = PublicationUtil.getPublication(getManager(), "test");
- return getIdentityMap().getFromURL("/" + pub.getId() + "/" + set.getArea() + set.getUrl());
+ return getFactory().getFromURL("/" + pub.getId() + "/" + set.getArea() + set.getUrl());
}
}
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java Fri Aug 11 07:11:34 2006
@@ -75,7 +75,7 @@
private DocumentFactory identityMap;
- protected DocumentFactory getIdentityMap() {
+ protected DocumentFactory getFactory() {
if (this.identityMap == null) {
Session session;
@@ -84,7 +84,7 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- this.identityMap = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ this.identityMap = DocumentUtil.createDocumentFactory(getManager(), session);
}
return this.identityMap;
}
@@ -98,11 +98,11 @@
protected Document getDocument(DocumentTestSet testSet) throws PublicationException {
Publication pub = PublicationUtil.getPublication(getManager(), "test");
- String uuid = SiteUtil.getUUID(getManager(), getIdentityMap(), pub, testSet.getArea(),
+ String uuid = SiteUtil.getUUID(getManager(), getFactory(), pub, testSet.getArea(),
testSet.getPath());
DocumentIdentifier id = new DocumentIdentifier(pub, testSet.getArea(), uuid, testSet
.getLanguage());
- DocumentImpl document = new DocumentImpl(getManager(), getIdentityMap(), id, getLogger());
+ DocumentImpl document = new DocumentImpl(getManager(), getFactory(), id, getLogger());
document.setDocumentURL(testSet.getUrl());
document.setExtension(testSet.getExtension());
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DocumentFactoryTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DocumentFactoryTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DocumentFactoryTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DocumentFactoryTest.java Fri Aug 11 07:11:34 2006
@@ -31,7 +31,7 @@
*/
public void testDocumentFactory() throws Exception {
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factoryA = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factoryA = DocumentUtil.createDocumentFactory(getManager(), session);
Publication publication = PublicationUtil.getPublication(getManager(), "test");
@@ -39,7 +39,7 @@
Document docA2 = factoryA.get(publication, Publication.AUTHORING_AREA, "/index", "en");
assertSame(docA1, docA2);
- DocumentFactory factoryB = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factoryB = DocumentUtil.createDocumentFactory(getManager(), session);
Document docB1 = factoryB.get(publication, Publication.AUTHORING_AREA, "/index", "en");
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DublinCoreTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DublinCoreTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DublinCoreTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/DublinCoreTest.java Fri Aug 11 07:11:34 2006
@@ -51,7 +51,7 @@
Publication publication = PublicationUtil.getPublication(getManager(), "test");
- DocumentFactory map = getIdentityMap();
+ DocumentFactory map = getFactory();
Document doc = map.get(publication, AREA, DOCUMENT_ID, LANGUAGE);
doc.getRepositoryNode().lock();
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/TestPageEnvelope.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/TestPageEnvelope.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/TestPageEnvelope.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/TestPageEnvelope.java Fri Aug 11 07:11:34 2006
@@ -42,7 +42,7 @@
try {
Session session = RepositoryUtil.createSession(manager, null);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(manager, session);
setDocument(map.getFromURL(url));
} catch (Exception e) {
throw new PageEnvelopeException(e);
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java Fri Aug 11 07:11:34 2006
@@ -98,7 +98,7 @@
getLogger().info(" Destination language: [" + _destinationLanguage + "]");
Publication publication = PublicationUtil.getPublication(getManager(), "test");
- DocumentFactory map = getIdentityMap();
+ DocumentFactory map = getFactory();
Document sourceDocument = map.get(publication,
sourceArea,
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java Fri Aug 11 07:11:34 2006
@@ -43,7 +43,7 @@
TransactionException, ServiceException {
Session session = RepositoryUtil.createSession(getManager(), getIdentity());
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(getManager(), session);
Publication pub = PublicationUtil.getPublication(getManager(), "test");
DocumentIdentifier identifier = new DocumentIdentifier(pub,
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/site/simple/SimpleSiteManagerTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/site/simple/SimpleSiteManagerTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/site/simple/SimpleSiteManagerTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/site/simple/SimpleSiteManagerTest.java Fri Aug 11 07:11:34 2006
@@ -44,7 +44,7 @@
login("lenya");
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication[] pubs = PublicationUtil.getPublications(getManager());
@@ -91,7 +91,7 @@
ResourceType type = (ResourceType) resourceTypeSelector.select("entry");
String contentSourceUri = structure.getRepositoryNode().getSourceURI();
- Document doc = docManager.add(getIdentityMap(),
+ Document doc = docManager.add(getFactory(),
type,
contentSourceUri,
pub,
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java Fri Aug 11 07:11:34 2006
@@ -53,7 +53,7 @@
public void testWorkflow() throws Exception {
Publication publication = PublicationUtil.getPublication(getManager(), "test");
String url = "/" + publication.getId() + URL;
- DocumentFactory map = getIdentityMap();
+ DocumentFactory map = getFactory();
Document document = map.getFromURL(url);
document.getRepositoryNode().lock();
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java Fri Aug 11 07:11:34 2006
@@ -74,7 +74,7 @@
Request request = ObjectModelHelper.getRequest(objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
String url = ServletHelper.getWebappURI(request);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentInfoModule.java Fri Aug 11 07:11:34 2006
@@ -100,7 +100,7 @@
try {
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory docFactory = DocumentUtil.createDocumentIdentityMap(this.manager,
+ DocumentFactory docFactory = DocumentUtil.createDocumentFactory(this.manager,
session);
Publication publication = PublicationUtil.getPublication(this.manager, publicationId);
document = docFactory.get(publication, area, uuid, language);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/OperationModule.java Fri Aug 11 07:11:34 2006
@@ -55,7 +55,7 @@
if (this.documentIdentityMap == null) {
try {
Session session = RepositoryUtil.getSession(this.manager, this.request);
- this.documentIdentityMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.documentIdentityMap = DocumentUtil.createDocumentFactory(this.manager, session);
} catch (RepositoryException e) {
throw new RuntimeException(e);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyUrlModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyUrlModule.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyUrlModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ProxyUrlModule.java Fri Aug 11 07:11:34 2006
@@ -89,7 +89,7 @@
try {
Request request = ObjectModelHelper.getRequest(objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
Publication publication = PublicationUtil.getPublication(this.manager, request);
Document doc = map.get(publication, area, documentId, language);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceTypeModule.java Fri Aug 11 07:11:34 2006
@@ -68,7 +68,7 @@
String[] steps = name.split(":");
if (steps.length == 1) {
- DocumentFactory docFactory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory docFactory = DocumentUtil.createDocumentFactory(this.manager, session);
String webappUrl = ServletHelper.getWebappURI(request);
Document document = docFactory.getFromURL(webappUrl);
pub = document.getPublication();
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java Fri Aug 11 07:11:34 2006
@@ -70,7 +70,7 @@
Request request = getRequest(cocoon);
try {
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
PageEnvelopeFactory factory = PageEnvelopeFactory.getInstance();
Publication publication = PublicationUtil.getPublication(this.manager, request);
return factory.getPageEnvelope(this.manager, map, cocoon.getObjectModel(), publication);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/LenyaMetaDataGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/LenyaMetaDataGenerator.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/LenyaMetaDataGenerator.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/LenyaMetaDataGenerator.java Fri Aug 11 07:11:34 2006
@@ -194,7 +194,7 @@
e);
}
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
this.document = map.get(pub, area, uuid, language);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/SiteSourceFactory.java Fri Aug 11 07:11:34 2006
@@ -135,7 +135,7 @@
String path = relativePath.substring(prefix.length());
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(this.manager, session);
ServiceSelector selector = null;
SiteManager siteManager = null;
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java Fri Aug 11 07:11:34 2006
@@ -101,7 +101,7 @@
try {
Session session = RepositoryUtil.getSession(this.manager, _request);
- this.identityMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.identityMap = DocumentUtil.createDocumentFactory(this.manager, session);
String url = ServletHelper.getWebappURI(_request);
this.currentDocument = this.identityMap.getFromURL(url);
} catch (final Exception e1) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentUtil.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentUtil.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentUtil.java Fri Aug 11 07:11:34 2006
@@ -35,7 +35,7 @@
* @param session The session.
* @return if an error occurs.
*/
- public static DocumentFactory createDocumentIdentityMap(ServiceManager manager, Session session) {
+ public static DocumentFactory createDocumentFactory(ServiceManager manager, Session session) {
DocumentFactory map;
DocumentManager docManager = null;
try {
@@ -62,7 +62,7 @@
public static Document getCurrentDocument(ServiceManager manager, Request request)
throws RepositoryException, DocumentBuildException {
Session session = RepositoryUtil.getSession(manager, request);
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(manager, session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(manager, session);
String url = ServletHelper.getWebappURI(request);
Document doc = null;
if (factory.isDocument(url)) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentHelper.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentHelper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentHelper.java Fri Aug 11 07:11:34 2006
@@ -70,7 +70,7 @@
} catch (RepositoryException e) {
throw new RuntimeException(e);
}
- this.identityMap = DocumentUtil.createDocumentIdentityMap(manager, session);
+ this.identityMap = DocumentUtil.createDocumentFactory(manager, session);
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java Fri Aug 11 07:11:34 2006
@@ -66,7 +66,7 @@
try {
Session session = RepositoryUtil.getSession(manager, request);
- this.factory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.factory = DocumentUtil.createDocumentFactory(this.manager, session);
this.pub = PublicationUtil.getPublication(manager, objectModel);
} catch (Exception e) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java Fri Aug 11 07:11:34 2006
@@ -72,7 +72,7 @@
try {
Publication publication = PublicationUtil.getPublication(this.manager, publicationId);
- DocumentFactory docMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory docMap = DocumentUtil.createDocumentFactory(this.manager, session);
store = new DocumentStore(this.manager, docMap, publication, area, uuid, getLogger());
} catch (Exception e) {
throw new RepositoryException(e);
Modified: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java (original)
+++ lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java Fri Aug 11 07:11:34 2006
@@ -80,7 +80,7 @@
try {
contextUtility = (ContextUtility) serviceManager.lookup(ContextUtility.ROLE);
Session session = RepositoryUtil.getSession(this.serviceManager, contextUtility.getRequest());
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.serviceManager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.serviceManager, session);
if (map.isDocument(webappUrl)) {
Document document = map.getFromURL(webappUrl);
if (document.existsInAnyLanguage()) {
Modified: lenya/trunk/src/modules-core/observation-impl/java/src/org/apache/lenya/cms/observation/ObservationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/observation-impl/java/src/org/apache/lenya/cms/observation/ObservationManager.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/observation-impl/java/src/org/apache/lenya/cms/observation/ObservationManager.java (original)
+++ lenya/trunk/src/modules-core/observation-impl/java/src/org/apache/lenya/cms/observation/ObservationManager.java Fri Aug 11 07:11:34 2006
@@ -176,7 +176,7 @@
Publication pub = PublicationUtil.getPublication(this.manager, pubId);
Session session = RepositoryUtil.createSession(manager, identity);
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(this.manager, session);
String docPath = path.substring((pubId + "/content/" + area).length());
Modified: lenya/trunk/src/modules-core/observation-impl/java/test/org/apache/lenya/cms/observation/ObservationTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/observation-impl/java/test/org/apache/lenya/cms/observation/ObservationTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/observation-impl/java/test/org/apache/lenya/cms/observation/ObservationTest.java (original)
+++ lenya/trunk/src/modules-core/observation-impl/java/test/org/apache/lenya/cms/observation/ObservationTest.java Fri Aug 11 07:11:34 2006
@@ -33,7 +33,7 @@
public void testObservation() throws Exception {
login("lenya");
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication publication = PublicationUtil.getPublication(getManager(), "test");
Document doc = factory.get(publication, Publication.AUTHORING_AREA, "/index", "en");
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Fri Aug 11 07:11:34 2006
@@ -482,7 +482,7 @@
protected DocumentFactory getDocumentFactory() {
if (this.documentFactory == null) {
- this.documentFactory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.documentFactory = DocumentUtil.createDocumentFactory(this.manager, session);
}
return this.documentFactory;
}
Modified: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java (original)
+++ lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java Fri Aug 11 07:11:34 2006
@@ -96,7 +96,7 @@
throw new AccessControlException(e);
}
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
Document document = map.get(pub, area, documentId, language);
if (getLogger().isDebugEnabled()) {
Modified: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java (original)
+++ lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java Fri Aug 11 07:11:34 2006
@@ -126,7 +126,7 @@
try {
Request request = ObjectModelHelper.getRequest(_objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
String webappUrl = ServletHelper.getWebappURI(request);
Document document = null;
Modified: lenya/trunk/src/modules/lenyadoc/java/src/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/lenyadoc/java/src/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/lenyadoc/java/src/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java (original)
+++ lenya/trunk/src/modules/lenyadoc/java/src/org/apache/lenya/cms/cocoon/source/LenyaDocSourceFactory.java Fri Aug 11 07:11:34 2006
@@ -191,7 +191,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Creating repository source for URI [" + location + "]");
}
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
Document document;
try {
document = map.get(pub, area, uuid, language);
Modified: lenya/trunk/src/modules/linkcheck/java/src/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/linkcheck/java/src/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/linkcheck/java/src/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java (original)
+++ lenya/trunk/src/modules/linkcheck/java/src/org/apache/lenya/cms/cocoon/generation/LinkStatusGenerator.java Fri Aug 11 07:11:34 2006
@@ -323,7 +323,7 @@
} catch (RepositoryException e) {
throw new ProcessingException(e);
}
- this.identityMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.identityMap = DocumentUtil.createDocumentFactory(this.manager, session);
super.setup(resolver, objectModel, src, par);
this.src = src;
Modified: lenya/trunk/src/modules/lucene/java/test/org/apache/lenya/cms/lucene/IndexUpdaterTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/java/test/org/apache/lenya/cms/lucene/IndexUpdaterTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/lucene/java/test/org/apache/lenya/cms/lucene/IndexUpdaterTest.java (original)
+++ lenya/trunk/src/modules/lucene/java/test/org/apache/lenya/cms/lucene/IndexUpdaterTest.java Fri Aug 11 07:11:34 2006
@@ -33,7 +33,7 @@
public void testIndexUpdater() throws Exception {
login("lenya");
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication publication = PublicationUtil.getPublication(getManager(), "test");
Document sourceDoc = factory.get(publication, Publication.AUTHORING_AREA, "/tutorial", "en");
Modified: lenya/trunk/src/modules/migration/java/test/org/apache/lenya/cms/migration/MigrateUuidsTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/migration/java/test/org/apache/lenya/cms/migration/MigrateUuidsTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/migration/java/test/org/apache/lenya/cms/migration/MigrateUuidsTest.java (original)
+++ lenya/trunk/src/modules/migration/java/test/org/apache/lenya/cms/migration/MigrateUuidsTest.java Fri Aug 11 07:11:34 2006
@@ -40,7 +40,7 @@
login("lenya");
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication[] pubs = PublicationUtil.getPublications(getManager());
for (int i = 0; i < pubs.length; i++) {
this.migratedDocs.clear();
Modified: lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java (original)
+++ lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java Fri Aug 11 07:11:34 2006
@@ -53,7 +53,7 @@
String documentId = "/testResource";
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication pub = PublicationUtil.getPublication(getManager(), "test");
Modified: lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/site/usecases/ResourceLinkRewriterTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/site/usecases/ResourceLinkRewriterTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/site/usecases/ResourceLinkRewriterTest.java (original)
+++ lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/site/usecases/ResourceLinkRewriterTest.java Fri Aug 11 07:11:34 2006
@@ -37,7 +37,7 @@
String documentId = "/testResourceLinkRewriting";
Session session = RepositoryUtil.getSession(getManager(), getRequest());
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(getManager(), session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(getManager(), session);
Publication pub = PublicationUtil.getPublication(getManager(), "test");
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java Fri Aug 11 07:11:34 2006
@@ -84,7 +84,7 @@
Request request = ObjectModelHelper.getRequest(objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
if (name.equals(AUTHORING_NODE)) {
SiteTree authoringTree = _manager.getTree(map,
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java Fri Aug 11 07:11:34 2006
@@ -152,7 +152,7 @@
try {
Session session = RepositoryUtil.getSession(this.manager, request);
- this.identityMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.identityMap = DocumentUtil.createDocumentFactory(this.manager, session);
this.publication = PublicationUtil.getPublication(this.manager, _objectModel);
} catch (Exception e) {
throw new ProcessingException("Could not create publication: ", e);
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java Fri Aug 11 07:11:34 2006
@@ -114,7 +114,7 @@
this.publication = PublicationUtil.getPublication(this.manager, _objectModel);
Request request = ObjectModelHelper.getRequest(_objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- this.identityMap = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ this.identityMap = DocumentUtil.createDocumentFactory(this.manager, session);
String url = ServletHelper.getWebappURI(request);
setDocument(this.identityMap.getFromURL(url));
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java Fri Aug 11 07:11:34 2006
@@ -55,7 +55,7 @@
DefaultSiteTree tree;
try {
Publication publication = PublicationUtil.getPublication(this.manager, publicationId);
- DocumentFactory factory = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory factory = DocumentUtil.createDocumentFactory(this.manager, session);
tree = new DefaultSiteTree(factory, publication, area, this.manager, getLogger());
} catch (Exception e) {
throw new RepositoryException(e);
Modified: lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java (original)
+++ lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java Fri Aug 11 07:11:34 2006
@@ -46,7 +46,7 @@
public void setUp() throws Exception {
super.setUp();
Publication pub = PublicationUtil.getPublication(getManager(), "test");
- this.siteTree = new DefaultSiteTree(getIdentityMap(),
+ this.siteTree = new DefaultSiteTree(getFactory(),
pub,
"test",
getManager(),
@@ -230,7 +230,7 @@
*/
final public void testImportSubtree() throws PublicationException, RepositoryException {
Publication pub = PublicationUtil.getPublication(getManager(), "test");
- DefaultSiteTree newSiteTree = new DefaultSiteTree(getIdentityMap(),
+ DefaultSiteTree newSiteTree = new DefaultSiteTree(getFactory(),
pub,
"test1",
getManager(),
Modified: lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java (original)
+++ lenya/trunk/src/modules/sitetree/java/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java Fri Aug 11 07:11:34 2006
@@ -44,7 +44,7 @@
public void setUp() throws Exception {
super.setUp();
Publication pub = PublicationUtil.getPublication(getManager(), "test");
- this.siteTree = new DefaultSiteTree(getIdentityMap(), pub, "testArea", getManager(), getLogger());
+ this.siteTree = new DefaultSiteTree(getFactory(), pub, "testArea", getManager(), getLogger());
ContainerUtil.enableLogging(siteTree, getLogger());
siteTree.getRepositoryNode().lock();
@@ -93,8 +93,8 @@
assertEquals(languages.length, 2);
for (int i = 0; i < languages.length; i++) {
Link label = this.node.getLink(languages[i]);
- Link label1 = new SiteTreeLink(getIdentityMap(), node, "Bar", "en");
- Link label2 = new SiteTreeLink(getIdentityMap(), node, "Stab", "de");
+ Link label1 = new SiteTreeLink(getFactory(), node, "Bar", "en");
+ Link label2 = new SiteTreeLink(getFactory(), node, "Stab", "de");
assertTrue(label.equals(label1) || label.equals(label2));
}
}
@@ -116,7 +116,7 @@
*
*/
final public void testAddLabel() throws SiteException {
- Link label = new SiteTreeLink(getIdentityMap(), this.node, "Barolo", "it");
+ Link label = new SiteTreeLink(getFactory(), this.node, "Barolo", "it");
this.node.addLabel((SiteTreeLink) label);
label = this.node.getLink("it");
assertNotNull(label);
Modified: lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogGenerator.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogGenerator.java (original)
+++ lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogGenerator.java Fri Aug 11 07:11:34 2006
@@ -118,7 +118,7 @@
try {
Request request = ObjectModelHelper.getRequest(this.objectModel);
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
Publication publication = PublicationUtil.getPublication(this.manager, request);
selector = (ServiceSelector) this.manager.lookup(SiteManager.ROLE + "Selector");
Modified: lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogOverviewGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogOverviewGenerator.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogOverviewGenerator.java (original)
+++ lenya/trunk/src/pubs/blog/java/src/org/apache/cocoon/generation/BlogOverviewGenerator.java Fri Aug 11 07:11:34 2006
@@ -178,7 +178,7 @@
SiteManager siteManager = null;
try {
Session session = RepositoryUtil.getSession(this.manager, request);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
Publication publication = PublicationUtil.getPublication(
this.manager, request);
Modified: lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java?rev=430795&r1=430794&r2=430795&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java (original)
+++ lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java Fri Aug 11 07:11:34 2006
@@ -136,7 +136,7 @@
}
protected void updateFeed() throws Exception {
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, getSession());
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, getSession());
Document[] docs = new Document[2];
org.w3c.dom.Document[] doms = new org.w3c.dom.Document[2];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org