You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/11/24 15:19:32 UTC
svn commit: r1038616 - in /lenya/trunk/org.apache.lenya.core.document.impl:
./ src/main/java/org/apache/lenya/cms/publication/
Author: florent
Date: Wed Nov 24 14:19:32 2010
New Revision: 1038616
URL: http://svn.apache.org/viewvc?rev=1038616&view=rev
Log:
- extract interfaces
Added:
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifierImpl.java
- copied, changed from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifier.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java
- copied, changed from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java
Removed:
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuildException.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentDoesNotExistException.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentException.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifier.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
Modified:
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
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=1038616&r1=1038615&r2=1038616&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/pom.xml Wed Nov 24 14:19:32 2010
@@ -16,6 +16,11 @@
<description>This module implements Documents in Lenya</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-document-api</artifactId>
+ </dependency>
+
<!-- <dependency> -->
<!-- <groupId>org.apache.lenya</groupId> -->
<!-- <artifactId>lenya-core-api</artifactId> -->
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=1038616&r1=1038615&r2=1038616&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 Wed Nov 24 14:19:32 2010
@@ -123,10 +123,12 @@ public class DocumentFactoryImpl impleme
* @return A document.
* @throws DocumentBuildException if an error occurs.
*/
+ //florent : seems never use, imply cyclic dependencies
+ /*
public Document getLanguageVersion(Document document, String language)
throws DocumentBuildException {
return get(document.getPublication(), document.getArea(), document.getUUID(), language);
- }
+ }*/
/**
* Builds a clone of a document for another area.
@@ -135,9 +137,11 @@ public class DocumentFactoryImpl impleme
* @return A document.
* @throws ResourceNotFoundException if an error occurs.
*/
+ //florent : seems never use, imply cyclic dependencies
+ /*
public Document getAreaVersion(Document document, String area) throws ResourceNotFoundException {
return get(document.getPublication(), area, document.getUUID(), document.getLanguage());
- }
+ }*/
/**
* Builds a document for the default language.
@@ -275,7 +279,7 @@ public class DocumentFactoryImpl impleme
try {
Publication publication = getPublication(publicationId);
DocumentBuilder builder = publication.getDocumentBuilder();
- DocumentIdentifier identifier = new DocumentIdentifier(publicationId, area, uuid,
+ DocumentIdentifier identifier = new DocumentIdentifierImpl(publicationId, area, uuid,
language);
document = buildDocument(identifier, revision, builder);
} catch (Exception e) {
Copied: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifierImpl.java (from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifier.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifierImpl.java?p2=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifierImpl.java&p1=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifier.java&r1=1035056&r2=1038616&rev=1038616&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifier.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentIdentifierImpl.java Wed Nov 24 14:19:32 2010
@@ -20,7 +20,7 @@ package org.apache.lenya.cms.publication
/**
* Value object to identify documents.
*/
-public class DocumentIdentifier {
+public class DocumentIdentifierImpl implements DocumentIdentifier {
private String publicationId;
private String area;
@@ -34,7 +34,7 @@ public class DocumentIdentifier {
* @param uuid The document UUID.
* @param language The language.
*/
- public DocumentIdentifier(String pubId, String area, String uuid, String language) {
+ public DocumentIdentifierImpl(String pubId, String area, String uuid, String language) {
if (uuid.startsWith("/") && uuid.split("-").length == 4) {
throw new IllegalArgumentException("The UUID [" + uuid + "] must not begin with a '/'!");
@@ -79,7 +79,7 @@ public class DocumentIdentifier {
}
public boolean equals(Object obj) {
- return (obj instanceof DocumentIdentifier) && obj.hashCode() == hashCode();
+ return (obj instanceof DocumentIdentifierImpl) && obj.hashCode() == hashCode();
}
public int hashCode() {
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=1038616&r1=1038615&r2=1038616&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 Wed Nov 24 14:19:32 2010
@@ -172,6 +172,13 @@ public class DocumentImpl implements Doc
}
return this.publication;
}
+
+ public String getPublicationId(){
+ if (this.publication == null) {
+ this.publication = getSession().getPublication(getIdentifier().getPublicationId());
+ }
+ return this.publication.getId();
+ }
/**
* @see org.apache.lenya.cms.publication.Document#getLastModified()
@@ -276,6 +283,8 @@ public class DocumentImpl implements Doc
}
}
+ //florent : seems never use, imply cyclic dependencies
+ /*
public boolean existsInAnyLanguage() throws ResourceNotFoundException {
String[] languages = getLanguages();
@@ -302,7 +311,7 @@ public class DocumentImpl implements Doc
return false;
}
- }
+ }*/
public DocumentIdentifier getIdentifier() {
return this.identifier;
@@ -482,6 +491,8 @@ public class DocumentImpl implements Doc
return getLink().getNode().getPath();
}
+ //florent : seems never use, imply cyclic dependencies
+ /*
public boolean existsAreaVersion(String area) {
String sourceUri = getSourceURI(getPublication(), area, getUUID(), getLanguage());
try {
@@ -489,15 +500,17 @@ 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);
@@ -548,6 +561,8 @@ 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 {
@@ -555,7 +570,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);
@@ -579,9 +594,11 @@ 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);
Copied: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java (from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java?p2=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java&p1=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java&r1=1035056&r2=1038616&rev=1038616&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocator.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java Wed Nov 24 14:19:32 2010
@@ -25,7 +25,7 @@ import java.util.WeakHashMap;
* A DocumentLocator describes a document based on its path in the site structure. The actual
* document doesn't have to exist.
*/
-public class DocumentLocator {
+public class DocumentLocatorImpl implements DocumentLocator {
private static Map locators = new WeakHashMap();
@@ -41,7 +41,7 @@ public class DocumentLocator {
String key = DocumentLocator.getKey(pubId, area, path, language);
DocumentLocator locator = (DocumentLocator) locators.get(key);
if (locator == null) {
- locator = new DocumentLocator(pubId, area, path, language);
+ locator = new DocumentLocatorImpl(pubId, area, path, language);
locators.put(key, locator);
}
return locator;
@@ -56,7 +56,7 @@ public class DocumentLocator {
private String path;
private String language;
- protected DocumentLocator(String pubId, String area, String path, String language) {
+ protected DocumentLocatorImpl(String pubId, String area, String path, String language) {
this.path = path;
this.pubId = pubId;
this.area = area;
@@ -197,6 +197,10 @@ public class DocumentLocator {
return DocumentLocator.getLocator(getPublicationId(), area, getPath(), getLanguage());
}
+ /*
+ * florent : seems not used, and introduce a cyclic dependencie with publication
+ */
+ /*
public Document getDocument(Session session) throws ResourceNotFoundException {
try {
Publication pub = session.getPublication(getPublicationId());
@@ -205,6 +209,6 @@ public class DocumentLocator {
} catch (PublicationException e) {
throw new ResourceNotFoundException(e);
}
- }
+ }*/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org