svn commit: r1073180 [2/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]> |
Modified: lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.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?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentLocatorImpl.java Mon Feb 21 23:06:11 2011
@@ -24,6 +24,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.
+ * It helps to locate a document inside a publication
*/
public class DocumentLocatorImpl implements DocumentLocator {
@@ -38,7 +39,7 @@ public class DocumentLocatorImpl impleme
* @return A document locator.
*/
public static DocumentLocator getLocator(String pubId, String area, String path, String language) {
- String key = DocumentLocator.getKey(pubId, area, path, language);
+ String key = getKey(pubId, area, path, language);
DocumentLocator locator = (DocumentLocator) locators.get(key);
if (locator == null) {
locator = new DocumentLocatorImpl(pubId, area, path, language);
@@ -98,7 +99,7 @@ public class DocumentLocatorImpl impleme
* @return A document locator.
*/
public DocumentLocator getPathVersion(String path) {
- return DocumentLocator.getLocator(getPublicationId(), getArea(), path, getLanguage());
+ return getLocator(getPublicationId(), getArea(), path, getLanguage());
}
/**
@@ -164,18 +165,18 @@ public class DocumentLocatorImpl impleme
* @return A document locator.
*/
public DocumentLocator getLanguageVersion(String language) {
- return DocumentLocator.getLocator(getPublicationId(), getArea(), getPath(), language);
+ return getLocator(getPublicationId(), getArea(), getPath(), language);
}
protected String getKey() {
- return DocumentLocator.getKey(getPublicationId(), getArea(), getPath(), getLanguage());
+ return getKey(getPublicationId(), getArea(), getPath(), getLanguage());
}
public boolean equals(Object obj) {
if (!(obj instanceof DocumentLocator)) {
return false;
}
- DocumentLocator locator = (DocumentLocator) obj;
+ DocumentLocatorImpl locator = (DocumentLocatorImpl) obj;
return locator.getKey().equals(getKey());
}
@@ -194,7 +195,7 @@ public class DocumentLocatorImpl impleme
* @return A document locator.
*/
public DocumentLocator getAreaVersion(String area) {
- return DocumentLocator.getLocator(getPublicationId(), area, getPath(), getLanguage());
+ return getLocator(getPublicationId(), area, getPath(), getLanguage());
}
/*
Copied: lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identity.java (from r1072031, lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identity.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identity.java?p2=lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identity.java&p1=lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identity.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/Identity.java (original)
+++ lenya/trunk/org.apache.lenya.core.identity/src/main/java/org/apache/lenya/ac/Identity.java Mon Feb 21 23:06:11 2011
@@ -169,7 +169,14 @@ public class Identity extends AbstractLo
}
return user;
}
-
+
+ /**
+ * return the string representation of the user
+ */
+ public String getUserId(){
+ User user = getUser();
+ return user.getId();
+ }
/**
* Returns the machine of this identity.
* @return A machine.
Modified: lenya/trunk/org.apache.lenya.core.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/pom.xml Mon Feb 21 23:06:11 2011
@@ -15,6 +15,16 @@
<packaging>jar</packaging>
<name>Apache Lenya Core Implementation</name>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -33,23 +43,11 @@
<artifactId>lenya-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-observation</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-repository</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
<version>2.2.3</version>
</dependency>
+
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
@@ -76,46 +74,6 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-ac</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-impl</artifactId>
- </dependency>
-
- <!-- FIXME: maybe the tests can be organized with less dependencies -->
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-sitetree</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-sourcerepository</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-xhtml</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-links</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-opendocument</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-module-cforms</artifactId>
- <scope>runtime</scope>
- </dependency>
+
</dependencies>
</project>
Copied: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/SchemaImpl.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.impl/src/main/java/org/apache/lenya/xml/SchemaImpl.java?p2=lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/SchemaImpl.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.impl/src/main/java/org/apache/lenya/xml/SchemaImpl.java Mon Feb 21 23:06:11 2011
@@ -37,7 +37,7 @@ package org.apache.lenya.xml;
/**
* Validation schema.
*/
-public class Schema {
+public class SchemaImpl implements Schema {
/**
* Ctor.
@@ -46,7 +46,7 @@ public class Schema {
* @param schemaUri The schema URI.
* @see org.apache.cocoon.components.validation.Validator
*/
- public Schema(String language, String schemaUri) {
+ public SchemaImpl(String language, String schemaUri) {
this.language = language;
this.uri = schemaUri;
}
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/ValidationUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/ValidationUtil.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/ValidationUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/xml/ValidationUtil.java Mon Feb 21 23:06:11 2011
@@ -26,7 +26,6 @@ import org.apache.avalon.framework.servi
import org.apache.cocoon.components.validation.Validator;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.lenya.cms.publication.Document;
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
@@ -40,11 +39,13 @@ public class ValidationUtil {
* @param handler The SAX error handler.
* @throws Exception if an error occurs.
*/
+ /* never used
public static void validate(Document document, ErrorHandler handler) throws Exception {
org.w3c.dom.Document xmlDoc = DocumentHelper.readDocument(document.getInputStream());
validate(xmlDoc, document.getResourceType().getSchema(), handler);
}
+ */
/**
* @param xmlDoc The XML document.
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml Mon Feb 21 23:06:11 2011
@@ -21,6 +21,23 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+ <bean name="org.apache.lenya.cms.publication.PublicationManager"
+ class="org.apache.lenya.cms.publication.PublicationManagerImpl">
+ <property name="nodeFactory" ref="org.apache.lenya.cms.repository.NodeFactory"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="pubBaseUri" value="file://${lenya.home}/pubs"/>
+ </bean>
+
+ <bean name="org.apache.lenya.cms.publication.DocumentFactoryBuilder"
+ class="org.apache.lenya.cms.publication.DocumentFactoryBuilderImpl">
+ <property name="publicationManager" ref="org.apache.lenya.cms.publication.PublicationManager"/>
+ <property name="metaDataCache" ref="org.apache.lenya.cms.metadata.MetaDataCache"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="nodeFactory" ref="org.apache.lenya.cms.repository.NodeFactory"/>
+ <property name="resourceTypeResolver"
+ ref="org.apache.lenya.cms.publication.ResourceTypeResolver"/>
+ </bean>
+
<bean name="org.apache.lenya.cms.publication.Repository"
class="org.apache.lenya.cms.publication.RepositoryImpl">
<property name="repositoryManager" ref="org.apache.lenya.cms.repository.RepositoryManager"/>
@@ -35,12 +52,7 @@
<property name="sharedItemStore" ref="org.apache.lenya.cms.repository.SharedItemStore"/>
</bean>
- <bean name="org.apache.lenya.cms.publication.PublicationManager"
- class="org.apache.lenya.cms.publication.PublicationManagerImpl">
- <property name="nodeFactory" ref="org.apache.lenya.cms.repository.NodeFactory"/>
- <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
- <property name="pubBaseUri" value="file://${lenya.home}/pubs"/>
- </bean>
+
<bean name="org.apache.lenya.cms.metadata.MetaDataRegistry"
class="org.apache.lenya.cms.metadata.MetaDataRegistryWrapper">
@@ -51,15 +63,7 @@
<bean name="org.apache.lenya.cms.metadata.MetaDataCache"
class="org.apache.lenya.cms.metadata.MetaDataCache"/>
- <bean name="org.apache.lenya.cms.publication.DocumentFactoryBuilder"
- class="org.apache.lenya.cms.publication.DocumentFactoryBuilderImpl">
- <property name="publicationManager" ref="org.apache.lenya.cms.publication.PublicationManager"/>
- <property name="metaDataCache" ref="org.apache.lenya.cms.metadata.MetaDataCache"/>
- <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
- <property name="nodeFactory" ref="org.apache.lenya.cms.repository.NodeFactory"/>
- <property name="resourceTypeResolver"
- ref="org.apache.lenya.cms.publication.ResourceTypeResolver"/>
- </bean>
+
<bean name="org.apache.lenya.cms.publication.ResourceTypeResolver"
class="org.apache.lenya.cms.publication.ResourceTypeResolverImpl"/>
Modified: lenya/trunk/org.apache.lenya.core.impl/src/test/resources/test-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/test/resources/test-components.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/test/resources/test-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/test/resources/test-components.xml Mon Feb 21 23:06:11 2011
@@ -26,12 +26,9 @@
<import resource="classpath:META-INF/cocoon/spring/lenya-core-observation-components.xml"/>
<import resource="classpath:META-INF/cocoon/spring/lenya-core-repository-components.xml"/>
<import resource="classpath:META-INF/cocoon/spring/lenya-core-resourcetype-components.xml"/>
- <import resource="classpath:META-INF/cocoon/spring/lenya-module-cforms-components.xml"/>
- <import resource="classpath:META-INF/cocoon/spring/lenya-module-links-components.xml"/>
- <import resource="classpath:META-INF/cocoon/spring/lenya-module-opendocument-components.xml"/>
+<!-- <import resource="classpath:META-INF/cocoon/spring/lenya-module-opendocument-components.xml"/>-->
<import resource="classpath:META-INF/cocoon/spring/lenya-module-sitetree-components.xml"/>
<import resource="classpath:META-INF/cocoon/spring/lenya-module-sourcerepository-components.xml"/>
- <import resource="classpath:META-INF/cocoon/spring/lenya-module-xhtml-components.xml"/>
<import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml"/>
</beans>
Modified: lenya/trunk/org.apache.lenya.core.janitor/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.janitor/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.janitor/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.janitor/pom.xml Mon Feb 21 23:06:11 2011
@@ -25,7 +25,27 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-repository</artifactId>
+ <artifactId>lenya-core-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-publication-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-observation</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>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java (original)
+++ lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java Mon Feb 21 23:06:11 2011
@@ -28,7 +28,8 @@ import org.apache.lenya.cms.observation.
import org.apache.lenya.cms.publication.DocumentIdentifier;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.Repository;
-import org.apache.lenya.cms.publication.Session;
+//import org.apache.lenya.cms.publication.Session;
+import org.apache.lenya.cms.repository.Session;
/**
* The content janitor cleans up empty directories after a document is removed.
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java Mon Feb 21 23:06:11 2011
@@ -30,7 +30,7 @@ import org.apache.lenya.cms.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;
/**
* Transform lenya-document: URLs to web application URLs.
* @see UuidToUrlRewriter
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java Mon Feb 21 23:06:11 2011
@@ -30,6 +30,7 @@ import org.apache.lenya.cms.linking.Link
import org.apache.lenya.cms.linking.UrlToUuidRewriter;
import org.apache.lenya.cms.publication.Repository;
import org.apache.lenya.cms.publication.Session;
+
import org.xml.sax.SAXException;
/**
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkConverter.java Mon Feb 21 23:06:11 2011
@@ -49,9 +49,13 @@ public class LinkConverter extends Abstr
* @param doc The document to convert.
* @param useContextPath If the request's context path should be considered.
*/
- public void convertUrlsToUuids(Document doc, boolean useContextPath) {
+ /*Florent : remove because document.getPublication create a cyclic dependency between document and publication
+ * use usecase.getpublicationId in the next method
+ * TODO : remove comment when ok
+ */
+ /*public void convertUrlsToUuids(Document doc, boolean useContextPath) {
convertUrlsToUuids(doc.getPublication(), doc, useContextPath);
- }
+ }*/
/**
* Converts all URL-based links to UUID-based links. The link URLs can originate from a
@@ -76,10 +80,13 @@ public class LinkConverter extends Abstr
"Convert links: No XPaths for resource type [" + type.getName() + "]");
}
} else {
- Publication pub = examinedDocument.getPublication();
- LinkRewriter incomingRewriter = new IncomingLinkRewriter(pub);
- LinkRewriter urlToUuidRewriter = new UrlToUuidRewriter(examinedDocument
- .getSession());
+ //florent : remove cause of cyclic dependency document - publication
+ //Publication pub = examinedDocument.getPublication();
+ //LinkRewriter incomingRewriter = new IncomingLinkRewriter(pub);
+ LinkRewriter incomingRewriter = new IncomingLinkRewriter(srcPub);
+ //florent : session is not still accessible throw document, so use publication instead
+ //LinkRewriter urlToUuidRewriter = new UrlToUuidRewriter(examinedDocument.getSession());
+ LinkRewriter urlToUuidRewriter = new UrlToUuidRewriter(srcPub.getSession());
org.w3c.dom.Document xml = DocumentHelper.readDocument(examinedDocument
.getInputStream());
@@ -111,8 +118,12 @@ public class LinkConverter extends Abstr
}
final String srcPubPrefix = "/" + srcPub.getId() + "/";
if (srcPubUrl.startsWith(srcPubPrefix)) {
- final String destPubUrl = "/" + pub.getId() + "/"
- + srcPubUrl.substring(srcPubPrefix.length());
+ //florent : modification cause pub was remplaced by srcpub at the function beginning
+ //check concequences of this modification
+ // final String destPubUrl = "/" + pub.getId() + "/"
+ // + srcPubUrl.substring(srcPubPrefix.length());
+ final String destPubUrl = "/" + srcPub.getId() + "/"
+ + srcPubUrl.substring(srcPubPrefix.length());
if (urlToUuidRewriter.matches(destPubUrl)) {
String rewrittenUrl = urlToUuidRewriter.rewrite(destPubUrl);
attribute.setValue(rewrittenUrl);
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolver.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolver.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolver.java Mon Feb 21 23:06:11 2011
@@ -21,7 +21,7 @@ import java.net.MalformedURLException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Session;
-
+import org.apache.lenya.cms.linking.LinkTarget;
/**
* <p>
* Resolve a link from a document to another document using it's
@@ -88,8 +88,12 @@ public interface LinkResolver {
* @return A link target.
* @throws MalformedURLException if the URI is invalid.
*/
- LinkTarget resolve(Document currentDocument, String linkUri) throws MalformedURLException;
-
+ //florent : change the method signature by adding a session attribute because document don't still handle his session
+ //TODO : see if session have to be inside the implementation of linkTarget
+ //TODO : remove comments when ok
+ //LinkTarget resolve(Document currentDocument, String linkUri) throws MalformedURLException;
+ LinkTarget resolve(Session session, Document currentDocument, String linkUri) throws MalformedURLException;
+
/**
* Resolve a link. The link URI has to contain the UUID, language, area and publication ID.
* @param session The session to use.
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/java/org/apache/lenya/cms/linking/LinkResolverImpl.java Mon Feb 21 23:06:11 2011
@@ -22,6 +22,7 @@ import java.net.MalformedURLException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
@@ -38,8 +39,8 @@ public class LinkResolverImpl extends Ab
*/
public static final String ROLE = LinkResolverImpl.class.getName();
- //TODO : florent : change the method signature by adding a session attribute because document don't still handle his session
- // remove comments when ok
+ //florent : change the method signature by adding a session attribute because document don't still handle his session
+ //TODO : remove comments when ok
public LinkTarget resolve(Session session, Document currentDoc, String linkUri) throws MalformedURLException {
Link link = new Link(linkUri);
@@ -123,13 +124,21 @@ public class LinkResolverImpl extends Ab
Area areaObj = pub.getArea(area);
Document doc;
if (areaObj.contains(uuid, language)) {
- doc = areaObj.getDocument(uuid, language);
+ try {
+ doc = areaObj.getDocument(uuid, language);
+ } catch (ResourceNotFoundException e) {
+ throw new RuntimeException(e);
+ }
} else {
if (this.fallbackMode == MODE_FAIL) {
doc = null;
} else if (this.fallbackMode == MODE_DEFAULT_LANGUAGE) {
if (areaObj.contains(uuid, pub.getDefaultLanguage())) {
- doc = pub.getArea(area).getDocument(uuid, pub.getDefaultLanguage(), revision);
+ try {
+ doc = pub.getArea(area).getDocument(uuid, pub.getDefaultLanguage(), revision);
+ } catch (ResourceNotFoundException e) {
+ throw new RuntimeException(e);
+ }
} else {
doc = null;
}
Modified: lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.api/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistry.java Mon Feb 21 23:06:11 2011
@@ -17,6 +17,7 @@
*/
package org.apache.lenya.cms.metadata;
+
/**
* Meta data registry.
*/
@@ -43,6 +44,14 @@ public interface MetaDataRegistry {
boolean isRegistered(String namespaceUri) throws MetaDataException;
/**
+ * Register an element set.
+ * @param namespaceUri The namespace URI.
+ * @param elementSet The element set.
+ * @throws MetaDataException if a set is already registered for this name.
+ */
+ void register(String namespaceUri, ElementSet elementSet) throws MetaDataException;
+
+ /**
* @return The registered namespace URIs.
* @throws MetaDataException if an error occurs.
*/
Added: lenya/trunk/org.apache.lenya.core.metadata.cocoon/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.cocoon/pom.xml?rev=1073180&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.cocoon/pom.xml (added)
+++ lenya/trunk/org.apache.lenya.core.metadata.cocoon/pom.xml Mon Feb 21 23:06:11 2011
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ <relativePath>../org.apache.lenya.parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata-cocoon</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Lenya metadata cocoon</name>
+ <description>Manipulate metadatas with cocoon</description>
+
+ <dependencies>
+
+ <!-- TODO : see if all theses dependencies are required -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-servlet-service-components</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-template-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-flowscript-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: lenya/trunk/org.apache.lenya.core.metadata.cocoon/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.cocoon/rcl.properties?rev=1073180&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.cocoon/rcl.properties (added)
+++ lenya/trunk/org.apache.lenya.core.metadata.cocoon/rcl.properties Mon Feb 21 23:06:11 2011
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+org.apache.lenya.lenya-core-metadata-cocoon.service%classes-dir=./target/classes
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/pom.xml Mon Feb 21 23:06:11 2011
@@ -19,28 +19,55 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.avalon.framework</groupId>-->
+<!-- <artifactId>avalon-framework-api</artifactId>-->
+<!-- </dependency>-->
<!-- Lenya -->
-
- <dependency>
+ <dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-api</artifactId>
+ <artifactId>lenya-core-metadata-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-usecase</artifactId>
+ <artifactId>lenya-core-document-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-workflow</artifactId>-->
+<!-- <artifactId>lenya-core-publication-impl</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-cocoon</artifactId>
+ <artifactId>lenya-core-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-identity</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-api</artifactId>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-usecase</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-workflow</artifactId>-->
+<!-- </dependency> -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-cocoon</artifactId>-->
+<!-- </dependency>-->
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementSetWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementSetWrapper.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementSetWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementSetWrapper.java Mon Feb 21 23:06:11 2011
@@ -20,12 +20,16 @@ package org.apache.lenya.cms.metadata;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lenya.cms.repository.metadata.ElementSet;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//florent :
+/*import org.apache.lenya.cms.repository.metadata.ElementSet;
+import org.apache.lenya.cms.repository.metadata.MetaDataException;*/
+import org.apache.lenya.cms.metadata.ElementSet;
+import org.apache.lenya.cms.metadata.MetaDataException;
public class ElementSetWrapper implements org.apache.lenya.cms.metadata.ElementSet {
- private org.apache.lenya.cms.repository.metadata.ElementSet delegate;
+ //florent private org.apache.lenya.cms.repository.metadata.ElementSet delegate;
+ private ElementSet delegate;
private Map<String, ElementWrapper> elements = new HashMap<String, ElementWrapper>();
public ElementSetWrapper(ElementSet delegate) {
@@ -51,7 +55,8 @@ public class ElementSetWrapper implement
}
public Element[] getElements() {
- org.apache.lenya.cms.repository.metadata.Element[] elements = this.delegate.getElements();
+ //florent org.apache.lenya.cms.repository.metadata.Element[] elements = this.delegate.getElements();
+ Element[] elements = this.delegate.getElements();
Element[] wrappers = new Element[elements.length];
for (int i = 0; i < elements.length; i++) {
try {
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementWrapper.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/ElementWrapper.java Mon Feb 21 23:06:11 2011
@@ -17,11 +17,13 @@
*/
package org.apache.lenya.cms.metadata;
-import org.apache.lenya.cms.repository.metadata.Element;
+//florent import org.apache.lenya.cms.repository.metadata.Element;
+import org.apache.lenya.cms.metadata.Element;
public class ElementWrapper implements org.apache.lenya.cms.metadata.Element {
- private org.apache.lenya.cms.repository.metadata.Element delegate;
+ //private org.apache.lenya.cms.repository.metadata.Element delegate;
+ private org.apache.lenya.cms.metadata.Element delegate;
public ElementWrapper(Element delegate) {
this.delegate = delegate;
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryWrapper.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataRegistryWrapper.java Mon Feb 21 23:06:11 2011
@@ -3,11 +3,14 @@ package org.apache.lenya.cms.metadata;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//florent import org.apache.lenya.cms.repository.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataRegistry;
public class MetaDataRegistryWrapper implements MetaDataRegistry {
- private org.apache.lenya.cms.repository.metadata.MetaDataRegistry metaDataRegistry;
+ //florent private org.apache.lenya.cms.repository.metadata.MetaDataRegistry metaDataRegistry;
+ private MetaDataRegistry metaDataRegistry;
private Map<String, ElementSetWrapper> elementSets = new HashMap<String, ElementSetWrapper>();
@@ -42,13 +45,21 @@ public class MetaDataRegistryWrapper imp
}
}
- public void setRepositoryMetaDataRegistry(
- org.apache.lenya.cms.repository.metadata.MetaDataRegistry metaDataRegistry) {
+ public void setRepositoryMetaDataRegistry(MetaDataRegistry metaDataRegistry) {
+ //florent org.apache.lenya.cms.repository.metadata.MetaDataRegistry metaDataRegistry) {
+
this.metaDataRegistry = metaDataRegistry;
}
- public org.apache.lenya.cms.repository.metadata.MetaDataRegistry getRepositoryMetaDataRegistry() {
+ //florent public org.apache.lenya.cms.repository.metadata.MetaDataRegistry getRepositoryMetaDataRegistry() {
+ public MetaDataRegistry getRepositoryMetaDataRegistry() {
return this.metaDataRegistry;
}
+ public void register(String namespaceUri, ElementSet elementSet)
+ throws MetaDataException {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataWrapper.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/metadata/MetaDataWrapper.java Mon Feb 21 23:06:11 2011
@@ -17,22 +17,28 @@
*/
package org.apache.lenya.cms.metadata;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//florent import org.apache.lenya.cms.repository.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaData;
public class MetaDataWrapper implements MetaData {
- private org.apache.lenya.cms.repository.metadata.MetaData delegate;
+ //florent private org.apache.lenya.cms.repository.metadata.MetaData delegate;
+ private MetaData delegate;
- public MetaDataWrapper(org.apache.lenya.cms.repository.metadata.MetaData delegate) {
+ //florent public MetaDataWrapper(org.apache.lenya.cms.repository.metadata.MetaData delegate) {
+ public MetaDataWrapper(MetaData delegate) {
this.delegate = delegate;
}
- protected org.apache.lenya.cms.repository.metadata.MetaData getDelegate() {
+ //florent protected org.apache.lenya.cms.repository.metadata.MetaData getDelegate() {
+ protected MetaData getDelegate() {
return this.delegate;
}
public void addValue(String key, String value)
- throws org.apache.lenya.cms.metadata.MetaDataException {
+ //florent throws org.apache.lenya.cms.metadata.MetaDataException {
+ throws MetaDataException {
try {
this.delegate.addValue(key, value);
} catch (MetaDataException e) {
@@ -41,7 +47,8 @@ public class MetaDataWrapper implements
}
public void forcedReplaceBy(MetaData other)
- throws org.apache.lenya.cms.metadata.MetaDataException {
+ //florent throws org.apache.lenya.cms.metadata.MetaDataException {
+ throws MetaDataException {
MetaDataWrapper wrapper = (MetaDataWrapper) other;
try {
this.delegate.forcedReplaceBy(wrapper.getDelegate());
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java Mon Feb 21 23:06:11 2011
@@ -19,9 +19,14 @@ package org.apache.lenya.cms.repository;
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.cms.repository.metadata.MetaData;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+/*florent : package name change
+ * import org.apache.lenya.cms.repository.metadata.MetaData;
+ * import org.apache.lenya.cms.repository.metadata.MetaDataException;
import org.apache.lenya.cms.repository.metadata.MetaDataOwner;
+ */
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataOwner;
/**
* Provides access to a meta data source.
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java Mon Feb 21 23:06:11 2011
@@ -24,7 +24,8 @@ import java.util.List;
import java.util.Map;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//import org.apache.lenya.cms.repository.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Element;
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNode.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNode.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNode.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNode.java Mon Feb 21 23:06:11 2011
@@ -27,20 +27,24 @@ import org.apache.excalibur.source.Sourc
import org.apache.excalibur.source.TraversableSource;
import org.apache.lenya.cms.observation.RepositoryEventDescriptor;
import org.apache.lenya.cms.observation.RepositoryEvent;
+import org.apache.lenya.cms.observation.RepositoryEventImpl;
import org.apache.lenya.cms.rc.CheckInEntry;
import org.apache.lenya.cms.rc.RCML;
import org.apache.lenya.cms.rc.RCMLEntry;
import org.apache.lenya.cms.rc.RevisionControlException;
-import org.apache.lenya.cms.repository.metadata.MetaData;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//florent :
+/*import org.apache.lenya.cms.repository.metadata.MetaData;
+import org.apache.lenya.cms.repository.metadata.MetaDataException;*/
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.transaction.Lock;
import org.apache.lenya.transaction.TransactionException;
import org.apache.lenya.transaction.Transactionable;
+import org.apache.lenya.ac.Identity;
/**
* A repository node.
*
- * @version $Id$
*/
public class SourceNode extends AbstractLogEnabled implements Node, Transactionable {
@@ -185,7 +189,7 @@ public class SourceNode extends Abstract
protected int getCurrentRevisionNumber() throws RepositoryException {
CheckInEntry entry;
try {
- entry = getRcml().getLatestCheckInEntry();
+ entry = (CheckInEntry)getRcml().getLatestCheckInEntry();
} catch (RevisionControlException e) {
throw new RepositoryException(e);
}
@@ -342,7 +346,7 @@ public class SourceNode extends Abstract
}
protected void enqueueEvent(Object descriptor) {
- RepositoryEvent event = new RepositoryEvent(getRepositorySession(), this, descriptor);
+ RepositoryEvent event = new RepositoryEventImpl(getRepositorySession(), this, descriptor);
getRepositorySession().enqueueEvent(event);
}
@@ -408,7 +412,7 @@ public class SourceNode extends Abstract
public long getLastModified() throws RepositoryException {
try {
- CheckInEntry entry = getRcml().getLatestCheckInEntry();
+ CheckInEntry entry = (CheckInEntry)getRcml().getLatestCheckInEntry();
if (entry != null) {
return entry.getTime();
} else {
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java Mon Feb 21 23:06:11 2011
@@ -22,11 +22,17 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
-import org.apache.lenya.cms.repository.metadata.Element;
+//florent
+/*import org.apache.lenya.cms.repository.metadata.Element;
import org.apache.lenya.cms.repository.metadata.ElementSet;
import org.apache.lenya.cms.repository.metadata.MetaData;
import org.apache.lenya.cms.repository.metadata.MetaDataException;
-import org.apache.lenya.cms.repository.metadata.MetaDataRegistry;
+import org.apache.lenya.cms.repository.metadata.MetaDataRegistry;*/
+import org.apache.lenya.cms.metadata.Element;
+import org.apache.lenya.cms.metadata.ElementSet;
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataRegistry;
/**
* Source-node-based meta data.
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java Mon Feb 21 23:06:11 2011
@@ -26,12 +26,18 @@ import org.apache.cocoon.spring.configur
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.metadata.dublincore.DublinCore;
-import org.apache.lenya.cms.publication.PageEnvelope;
-import org.apache.lenya.cms.repository.metadata.ElementSet;
+//import org.apache.lenya.cms.publication.PageEnvelope;
+//florent
+/*import org.apache.lenya.cms.repository.metadata.ElementSet;
import org.apache.lenya.cms.repository.metadata.MetaData;
import org.apache.lenya.cms.repository.metadata.MetaDataException;
import org.apache.lenya.cms.repository.metadata.MetaDataOwner;
-import org.apache.lenya.cms.repository.metadata.MetaDataRegistry;
+import org.apache.lenya.cms.repository.metadata.MetaDataRegistry;*/
+import org.apache.lenya.cms.metadata.ElementSet;
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.metadata.MetaDataOwner;
+import org.apache.lenya.cms.metadata.MetaDataRegistry;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Document;
@@ -143,8 +149,11 @@ public class SourceNodeMetaDataHandler i
}
protected void loadLegacyMetaData(Document xml) throws MetaDataException {
- NamespaceHelper helper = new NamespaceHelper(PageEnvelope.NAMESPACE, "", xml);
-
+ //florent : remove the call to page enveloppe in order to remover cyclic dependencie to publication-impl
+ //TODO : create a module that contains all namespace used in Lenya
+ //NamespaceHelper helper = new NamespaceHelper(PageEnvelope.NAMESPACE, "", xml);
+ NamespaceHelper helper = new NamespaceHelper("http://apache.org/cocoon/lenya/page-envelope/1.0", "", xml);
+
Element metaElement = helper.getFirstChild(xml.getDocumentElement(), "meta");
Element internalElement = helper.getFirstChild(metaElement, "internal");
Copied: lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java (from r1072031, lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java?p2=lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java&p1=lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java&r1=1072031&r2=1073180&rev=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata.impl/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java Mon Feb 21 23:06:11 2011
@@ -29,14 +29,18 @@ import org.apache.lenya.cms.cocoon.sourc
import org.apache.lenya.cms.rc.CheckInEntry;
import org.apache.lenya.cms.rc.RCML;
import org.apache.lenya.cms.rc.RCMLEntry;
-import org.apache.lenya.cms.repository.metadata.MetaData;
-import org.apache.lenya.cms.repository.metadata.MetaDataException;
+//florent
+/*import org.apache.lenya.cms.repository.metadata.MetaData;
+import org.apache.lenya.cms.repository.metadata.MetaDataException;*/
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.metadata.MetaDataException;
/**
* Revision implementation.
*/
-public class SourceNodeRevision extends AbstractLogEnabled implements Revision {
-
+public class SourceNodeRevision extends AbstractLogEnabled implements Revision, ContentHolder {
+//florent : add contentHolder implements here as it was remove in Revision...
+
private SourceNode node;
private int number;
private long time = -1;
Modified: lenya/trunk/org.apache.lenya.core.observation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.observation/pom.xml Mon Feb 21 23:06:11 2011
@@ -15,17 +15,25 @@
<packaging>jar</packaging>
<name>Apache Lenya Core Observation</name>
<dependencies>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.avalon.framework</groupId>-->
+<!-- <artifactId>avalon-framework-api</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-api</artifactId>
+ <artifactId>lenya-core-repository-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-repository</artifactId>
+ <artifactId>lenya-core-document-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.lenya</groupId>-->
+<!-- <artifactId>lenya-core-publication</artifactId>-->
+<!-- </dependency>-->
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.properties/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.properties/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.properties/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.properties/pom.xml Mon Feb 21 23:06:11 2011
@@ -32,6 +32,14 @@
<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-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Modified: lenya/trunk/org.apache.lenya.core.properties/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PropertiesModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.properties/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PropertiesModule.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.properties/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PropertiesModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.properties/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PropertiesModule.java Mon Feb 21 23:06:11 2011
@@ -43,8 +43,10 @@ import org.apache.lenya.cms.module.Modul
import org.apache.lenya.cms.publication.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.cms.publication.URLInformation;
+//import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.URLInformation;
+import org.apache.lenya.utils.ServletHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -105,8 +107,10 @@ public class PropertiesModule extends De
protected Configuration getProperties(Map objectModel) throws ConfigurationException {
Configuration properties;
Request request = ObjectModelHelper.getRequest(objectModel);
- String webappUrl = ServletHelper.getWebappURI(request);
- URLInformation info = new URLInformation(webappUrl);
+ //florent
+ //String webappUrl = ServletHelper.getWebappURI(request);
+ //URLInformation info = new URLInformation(webappUrl);
+ URLInformation info = new URLInformation();
String pubId = info.getPublicationId();
Session session = this.repository.getSession(request);
if (session.existsPublication(pubId)) {
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java Mon Feb 21 23:06:11 2011
@@ -20,7 +20,6 @@ package org.apache.lenya.cms.publication
/**
* A DocumentIdentityMap avoids the multiple instanciation of a document object.
*
- * @version $Id$
*/
public interface DocumentFactory {
@@ -105,4 +104,9 @@ public interface DocumentFactory {
* @return If a publication with this ID exists.
*/
boolean existsPublication(String id);
+
+ void setPublicationManager(PublicationManager pubManager);
+
+ PublicationManager getPublicationManager();
+
}
Modified: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java Mon Feb 21 23:06:11 2011
@@ -38,8 +38,11 @@ public interface DocumentManager {
* @throws PublicationException if a document which destinationDocument depends on does not
* exist.
*/
+ //florent commented cause of change in document api
+ /*
void copy(Document sourceDocument, DocumentLocator destination) throws PublicationException;
-
+ */
+
/**
* Copies a document to another area.
* @param sourceDocument The document to copy.
@@ -47,8 +50,11 @@ public interface DocumentManager {
* @throws PublicationException if a document which the destination document depends on does not
* exist.
*/
+ //florent commented cause of change in document api
+ /*
void copyToArea(Document sourceDocument, String destinationArea) throws PublicationException;
-
+ */
+
/**
* Copies a document set to another area.
* @param documentSet The document set to copy.
@@ -56,8 +62,11 @@ public interface DocumentManager {
* @throws PublicationException if a document which one of the destination documents depends on
* does not exist.
*/
+ //florent commented cause of change in document api
+ /*
void copyToArea(DocumentSet documentSet, String destinationArea) throws PublicationException;
-
+ */
+
/**
* Creates a new document in the same publication the <code>parentDocument</code> belongs to
* with the given parameters:
@@ -74,10 +83,12 @@ public interface DocumentManager {
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
Document add(Document sourceDocument, String area, String path, String language,
String extension, String navigationTitle, boolean visibleInNav)
throws DocumentBuildException, PublicationException;
-
+ */
/**
* Creates a new document with the given parameters:
* @param resourceType the document type (aka resource type) of the new document
@@ -94,11 +105,14 @@ public interface DocumentManager {
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
Document add(ResourceType resourceType, String contentSourceUri,
Publication pub, String area, String path, String language, String extension,
String navigationTitle, boolean visibleInNav) throws DocumentBuildException,
PublicationException;
-
+ */
+
/**
* Creates a new document without adding it to the site structure.
* @param resourceType the document type (aka resource type) of the new document
@@ -112,10 +126,13 @@ public interface DocumentManager {
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
Document add(ResourceType resourceType, String contentSourceUri,
Publication pub, String area, String language, String extension)
throws DocumentBuildException, PublicationException;
-
+ */
+
/**
* Adds a new version of a document with a different language and / or in a different area.
*
@@ -127,9 +144,11 @@ public interface DocumentManager {
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
Document addVersion(Document sourceDocument, String area, String language)
throws DocumentBuildException, PublicationException;
-
+ */
/**
* Adds a new version of a document with a different language and / or in a different area.
*
@@ -142,16 +161,21 @@ public interface DocumentManager {
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
Document addVersion(Document sourceDocument, String area, String language, boolean addToSite)
throws DocumentBuildException, PublicationException;
-
+ */
/**
* Deletes a document from the content repository and from the site structure.
* @param document The document to delete.
* @throws PublicationException when something went wrong.
*/
+ //florent commented cause of change in document api
+ /*
void delete(Document document) throws PublicationException;
-
+ */
+
/**
* Moves a document from one location to another.
* @param sourceDocument The source document.
@@ -159,8 +183,11 @@ public interface DocumentManager {
* @throws PublicationException if a document which the destination document depends on does not
* exist.
*/
+ //florent commented cause of change in document api
+ /*
void move(Document sourceDocument, DocumentLocator destination) throws PublicationException;
-
+ */
+
/**
* Moves a document set from one location to another. A source is moved to the destination of
* the same position in the set.
@@ -169,8 +196,10 @@ public interface DocumentManager {
* @throws PublicationException if a document which the destination document depends on does not
* exist.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void move(DocumentSet sources, DocumentSet destinations) throws PublicationException;
-
+ */
/**
* Copies a document set from one location to another. A source is copied to the destination of
* the same position in the set.
@@ -179,8 +208,11 @@ public interface DocumentManager {
* @throws PublicationException if a document which the destination document depends on does not
* exist.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void copy(DocumentSet sources, DocumentSet destinations) throws PublicationException;
-
+ */
+
/**
* Moves a document to another location, incl. all requiring documents. If a sitetree is used,
* this means that the whole subtree is moved.
@@ -190,9 +222,11 @@ public interface DocumentManager {
* @param targetPath The target path.
* @throws PublicationException if an error occurs.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void moveAll(Area sourceArea, String sourcePath, Area targetArea, String targetPath)
throws PublicationException;
-
+ */
/**
* Moves all language versions of a document to another location.
* @param sourceArea The source area.
@@ -201,9 +235,11 @@ public interface DocumentManager {
* @param targetPath The target path.
* @throws PublicationException if the documents could not be moved.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void moveAllLanguageVersions(Area sourceArea, String sourcePath, Area targetArea,
String targetPath) throws PublicationException;
-
+ */
/**
* Copies a document to another location, incl. all requiring documents. If a sitetree is used,
* this means that the whole subtree is copied.
@@ -213,9 +249,12 @@ public interface DocumentManager {
* @param targetPath The target path.
* @throws PublicationException if an error occurs.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void copyAll(Area sourceArea, String sourcePath, Area targetArea, String targetPath)
throws PublicationException;
-
+ */
+
/**
* Copies all language versions of a document to another location.
* @param sourceArea The source area.
@@ -224,29 +263,38 @@ public interface DocumentManager {
* @param targetPath The target path.
* @throws PublicationException if the documents could not be copied.
*/
+ //florent : comment cause of document.getPublication() not still in api
+ /*
void copyAllLanguageVersions(Area sourceArea, String sourcePath, Area targetArea,
String targetPath) throws PublicationException;
-
+ */
+
/**
* Deletes a document, incl. all requiring documents. If a sitetree is used, this means that the
* whole subtree is deleted.
* @param document The document.
* @throws PublicationException if an error occurs.
*/
- void deleteAll(Document document) throws PublicationException;
+ //florent commented cause of change in document api
+ //void deleteAll(Document document) throws PublicationException;
/**
* Deletes all language versions of a document.
* @param document The document.
* @throws PublicationException if the documents could not be copied.
*/
+ //florent commented cause of change in document api
+ /*
void deleteAllLanguageVersions(Document document) throws PublicationException;
-
+ */
+
/**
* Deletes a set of documents.
* @param documents The documents.
* @throws PublicationException if an error occurs.
*/
+ //florent commented cause of change in document api
+ /*
void delete(DocumentSet documents) throws PublicationException;
-
+ */
}
\ No newline at end of file
Added: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java?rev=1073180&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java (added)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java Mon Feb 21 23:06:11 2011
@@ -0,0 +1,37 @@
+/*
+ * 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.cms.publication;
+
+import javax.servlet.http.HttpServletRequest;
+import org.apache.lenya.cms.publication.Session;
+
+
+//import org.apache.lenya.ac.Identity;
+
+public interface Repository {
+
+ Session getSession(HttpServletRequest request);
+
+ //florent : remove as it create cycliq dependencies.
+ //note : can be re-enable now as identity is in lenya-core-identity
+ // suppress this comment when ok
+ //Session startSession(Identity identity, boolean modifiable);
+
+ void removeSession(HttpServletRequest request);
+
+}
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/pom.xml?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/pom.xml Mon Feb 21 23:06:11 2011
@@ -28,6 +28,36 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-publication-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-document-api</artifactId>
+ </dependency>
+ <!-- This dependencie is just cause by call to static DocumentLocator.getLocator
+ in DefaultDocumentBuilder -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-document-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-repository-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-identity</artifactId>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.lenya</groupId>-->
<!-- <artifactId>lenya-core-metadata</artifactId>-->
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/AreaImpl.java Mon Feb 21 23:06:11 2011
@@ -63,6 +63,9 @@ public class AreaImpl implements Area {
if (getSite().containsByUuid(uuid, language)) {
return true;
} else {
+ return false;
+ //florent : comment as is create dependencie to document-impl and seems not useful as the containsbyUuid has to give the result
+ /*
String sourceUri = DocumentImpl.getSourceURI(pub, name, uuid, language);
try {
org.apache.lenya.cms.repository.Session repoSession = ((SessionHolder) this.session)
@@ -71,7 +74,7 @@ public class AreaImpl implements Area {
return node.exists();
} catch (RepositoryException e) {
throw new RuntimeException(e);
- }
+ }*/
}
}
Modified: lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?rev=1073180&r1=1073179&r2=1073180&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java Mon Feb 21 23:06:11 2011
@@ -195,7 +195,7 @@ public class DefaultDocumentBuilder exte
throw new MalformedURLException("Path [" + path + "] does not start with '/'!");
}
- return DocumentLocator.getLocator(publication.getId(), info.getArea(), path, language);
+ return DocumentLocatorImpl.getLocator(publication.getId(), info.getArea(), path, language);
}
/**