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 2009/02/10 02:37:38 UTC
svn commit: r742812 [2/2] - in /lenya/trunk: ./
org.apache.lenya.core.janitor/
org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/
org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/
org.apache.lenya.co...
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java Tue Feb 10 01:37:33 2009
@@ -29,9 +29,9 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.publication.ResourceTypeResolver;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -58,7 +58,7 @@
*/
protected Node[] getNodesToLock() throws UsecaseException {
SiteStructure structure = getSourceDocument().area().getSite();
- Node[] nodes = { structure.getRepositoryNode() };
+ Node[] nodes = { structure };
return nodes;
}
Modified: lenya/trunk/org.apache.lenya.module.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java (original)
+++ lenya/trunk/org.apache.lenya.module.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java Tue Feb 10 01:37:33 2009
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.workflow.usecases.InvokeWorkflow;
import org.apache.lenya.xml.DocumentHelper;
@@ -57,7 +57,7 @@
}
protected Node[] getNodesToLock() {
- Node[] nodes = { getSourceDocument().getRepositoryNode() };
+ Node[] nodes = { getSourceDocument() };
return nodes;
}
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java Tue Feb 10 01:37:33 2009
@@ -20,8 +20,8 @@
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.ResourceType;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.usecase.xml.UsecaseErrorHandler;
@@ -86,7 +86,7 @@
if (!hasErrors()) {
SourceUtil.writeDOM(xmlDoc, sourceDoc.getOutputStream());
String event = getParameterAsString(EVENT, DEFAULT_EVENT);
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), event);
+ WorkflowUtil.invoke(getSourceDocument(), event);
}
}
@@ -94,7 +94,7 @@
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
protected Node[] getNodesToLock() throws UsecaseException {
- Node[] objects = { getSourceDocument().getRepositoryNode() };
+ Node[] objects = { getSourceDocument() };
return objects;
}
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java Tue Feb 10 01:37:33 2009
@@ -109,14 +109,14 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected org.apache.lenya.cms.publication.Node[] getNodesToLock() throws UsecaseException {
org.apache.lenya.cms.publication.Document doc = getSourceDocument();
Set nodes = new HashSet();
if (doc != null) {
- nodes.add(doc.getRepositoryNode());
+ nodes.add(doc);
}
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (org.apache.lenya.cms.publication.Node[]) nodes
+ .toArray(new org.apache.lenya.cms.publication.Node[nodes.size()]);
}
/**
@@ -162,7 +162,7 @@
setParameter(VALIDATION_ERRORS, getErrorMessages());
} else if (!getParameterAsBoolean(WORKFLOW_INVOKED, false)) {
deleteParameter(VALIDATION_ERRORS);
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(getSourceDocument(), getEvent());
setParameter(WORKFLOW_INVOKED, Boolean.valueOf(true));
}
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java Tue Feb 10 01:37:33 2009
@@ -60,14 +60,14 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected org.apache.lenya.cms.publication.Node[] getNodesToLock() throws UsecaseException {
org.apache.lenya.cms.publication.Document doc = getSourceDocument();
Set nodes = new HashSet();
if (doc != null) {
- nodes.add(doc.getRepositoryNode());
+ nodes.add(doc);
}
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (org.apache.lenya.cms.publication.Node[]) nodes
+ .toArray(new org.apache.lenya.cms.publication.Node[nodes.size()]);
}
protected void prepareView() throws Exception {
@@ -179,7 +179,7 @@
*/
protected void saveDocument(Document content) throws Exception {
saveXMLFile(content, getSourceDocument());
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(getSourceDocument(), getEvent());
}
/**
Modified: lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java (original)
+++ lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java Tue Feb 10 01:37:33 2009
@@ -43,6 +43,7 @@
import org.apache.lenya.cms.linking.LinkConverter;
import org.apache.lenya.cms.linking.LinkRewriter;
import org.apache.lenya.cms.linking.OutgoingLinkRewriter;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.cms.usecase.DocumentUsecase;
@@ -71,8 +72,8 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
- org.apache.lenya.cms.repository.Node[] objects = { getSourceDocument().getRepositoryNode() };
+ protected Node[] getNodesToLock() throws UsecaseException {
+ Node[] objects = { getSourceDocument() };
return objects;
}
@@ -240,7 +241,7 @@
ValidationUtil.validate(xmlDoc, schema, new UsecaseErrorHandler(this));
if (!hasErrors()) {
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(getSourceDocument(), getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml Tue Feb 10 01:37:33 2009
@@ -31,5 +31,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.lucene/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/pom.xml Tue Feb 10 01:37:33 2009
@@ -44,6 +44,18 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-usecase</artifactId>
+ </dependency>
</dependencies>
<properties>
<!-- TODO Update Lucene version -->
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java Tue Feb 10 01:37:33 2009
@@ -21,7 +21,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -89,7 +89,7 @@
+ getSourceDocument() + "]");
}
- Node[] objects = { getSourceDocument().getRepositoryNode() };
+ Node[] objects = { getSourceDocument() };
return objects;
}
Modified: lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java Tue Feb 10 01:37:33 2009
@@ -100,7 +100,7 @@
this.site = pub.getArea(area).getSite();
this.cacheKey = pubId + "/" + area;
- source = resolver.resolveURI(this.site.getRepositoryNode().getSourceURI());
+ source = resolver.resolveURI(this.site.getSourceURI());
this.validity = source.getValidity();
} catch (Exception e) {
Modified: lenya/trunk/org.apache.lenya.module.notification/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.notification/pom.xml Tue Feb 10 01:37:33 2009
@@ -31,6 +31,14 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
</dependency>
<dependency>
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationListener.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationListener.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationListener.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationListener.java Tue Feb 10 01:37:33 2009
@@ -24,6 +24,8 @@
* Repository listener to distribute notification events.
*/
public class NotificationListener extends AbstractRepositoryListener {
+
+ private Notifier notifier;
public void eventFired(RepositoryEvent event) {
@@ -36,18 +38,16 @@
Message message = descriptor.getMessage();
- Notifier notifier = null;
try {
- notifier = (Notifier) this.manager.lookup(Notifier.ROLE);
- notifier.notify(message);
- } catch (Exception e) {
+ this.notifier.notify(message);
+ } catch (NotificationException e) {
throw new RuntimeException(e);
- } finally {
- if (notifier != null) {
- this.manager.release(notifier);
- }
}
}
+ public void setNotifier(Notifier notifier) {
+ this.notifier = notifier;
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java Tue Feb 10 01:37:33 2009
@@ -36,7 +36,6 @@
import org.apache.excalibur.source.TraversableSource;
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataException;
-import org.apache.lenya.cms.repository.RepositoryException;
/**
* Wrapper to handle resource documents.
Modified: lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java (original)
+++ lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java Tue Feb 10 01:37:33 2009
@@ -24,9 +24,8 @@
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.publication.RepositoryException;
import org.apache.lenya.cms.publication.ResourceWrapper;
-import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.util.ServletHelper;
/**
@@ -103,12 +102,10 @@
* Adds the ressource. If asset upload is not enabled, an error message is added.
* @throws IOException
* @throws ServiceException
- * @throws DocumentException
* @throws MetaDataException
* @throws RepositoryException
*/
- protected void addResource() throws ServiceException, IOException, DocumentException,
- RepositoryException, MetaDataException {
+ protected void addResource() throws ServiceException, IOException, MetaDataException, RepositoryException {
if (getLogger().isDebugEnabled())
getLogger().debug("Assets::addAsset() called");
Modified: lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/modules/resource/PdfToTextGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/modules/resource/PdfToTextGenerator.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/modules/resource/PdfToTextGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/modules/resource/PdfToTextGenerator.java Tue Feb 10 01:37:33 2009
@@ -23,8 +23,8 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.AbstractGenerator;
-import org.apache.lenya.cms.cocoon.source.RepositorySource;
-import org.apache.lenya.cms.repository.ContentHolder;
+import org.apache.lenya.cms.cocoon.source.DocumentSource;
+import org.apache.lenya.cms.publication.Document;
import org.pdfbox.pdfparser.PDFParser;
import org.pdfbox.pdmodel.PDDocument;
import org.pdfbox.util.PDFTextStripper;
@@ -50,17 +50,17 @@
protected static final String PREFIX = "pdf";
protected static final String NAMESPACE = "http://apache.org/lenya/pdf/1.0";
- private ContentHolder content;
+ private Document content;
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
- RepositorySource source = null;
+ DocumentSource source = null;
try {
- source = (RepositorySource) resolver.resolveURI(src);
- this.content = source.getContent();
+ source = (DocumentSource) resolver.resolveURI(src);
+ this.content = source.getDocument();
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
Modified: lenya/trunk/org.apache.lenya.module.simplesite/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/pom.xml Tue Feb 10 01:37:33 2009
@@ -24,6 +24,16 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <!-- TODO: remove after refactoring -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <!-- TODO: remove after refactoring -->
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-collection</artifactId>
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java Tue Feb 10 01:37:33 2009
@@ -30,8 +30,13 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.publication.DocumentImpl;
+import org.apache.lenya.cms.publication.History;
+import org.apache.lenya.cms.publication.LockException;
import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.RepositoryException;
import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
@@ -48,7 +53,7 @@
*
* @version $Id$
*/
-public class DocumentStore extends CollectionWrapper implements SiteStructure {
+public class DocumentStore extends CollectionWrapper implements SiteStructure, RepositoryItem {
/**
* The identifiable type.
@@ -127,7 +132,7 @@
}
public Node getRepositoryNode() {
- return getDelegate().getRepositoryNode();
+ return ((DocumentImpl) getDelegate()).getRepositoryNode();
}
public boolean contains(String path) {
@@ -302,4 +307,60 @@
public Session getRepositorySession() {
return getRepositoryNode().getRepositorySession();
}
+
+ public void checkin() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void checkout() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void checkout(boolean checkoutRestrictedToSession) throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void forceCheckIn() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getCheckoutUserId() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public org.apache.lenya.cms.publication.Session getSession() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getSourceURI() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isCheckedOut() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isCheckedOutBySession(String sessionId, String userId) {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isLocked() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void lock() throws LockException, RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void registerDirty() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void rollback(int revision) throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void unlock() throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
}
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/pom.xml Tue Feb 10 01:37:33 2009
@@ -25,6 +25,10 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
</dependency>
<dependency>
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java Tue Feb 10 01:37:33 2009
@@ -194,7 +194,7 @@
}
this.cacheKey = pubId + "/" + area + this.path;
- source = this.resolver.resolveURI(this.site.getRepositoryNode().getSourceURI());
+ source = this.resolver.resolveURI(this.site.getSourceURI());
this.validity = source.getValidity();
} catch (ProcessingException e) {
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Tue Feb 10 01:37:33 2009
@@ -30,9 +30,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.publication.Area;
+import org.apache.lenya.cms.publication.History;
+import org.apache.lenya.cms.publication.LockException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
+import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
@@ -52,7 +55,7 @@
*
* @version $Id: DefaultSiteTree.java 208764 2005-07-01 15:57:21Z andreas $
*/
-public class DefaultSiteTree extends AbstractLogEnabled implements SiteTree {
+public class DefaultSiteTree extends AbstractLogEnabled implements SiteTree, RepositoryItem {
private static final Log logger = LogFactory.getLog(DefaultSiteTree.class);
@@ -644,4 +647,110 @@
this.changed = true;
}
+ public void checkin() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkin();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout(boolean restrictedToSession)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout(restrictedToSession);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void forceCheckIn() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().forceCheckIn();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public String getCheckoutUserId() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().getCheckoutUserId();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public org.apache.lenya.cms.publication.Session getSession() {
+ return this.pub.getSession();
+ }
+
+ public String getSourceURI() {
+ return getRepositoryNode().getSourceURI();
+ }
+
+ public boolean isCheckedOut() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOut();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isCheckedOutBySession(String sessionId, String userId)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOutBySession(sessionId, userId);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isLocked() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isLocked();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void lock() throws LockException, org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().lock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void registerDirty() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().registerDirty();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void rollback(int revision) throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().rollback(revision);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void unlock() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().unlock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeVisitor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeVisitor.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeVisitor.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeVisitor.java Tue Feb 10 01:37:33 2009
@@ -23,18 +23,17 @@
import org.apache.lenya.cms.publication.DocumentException;
/**
- * Visitor interface to define operations performed on SiteTreeNode
- * (Visitor pattern)
- *
+ * Visitor interface to define operations performed on SiteTreeNode (Visitor pattern)
+ *
*/
public interface SiteTreeNodeVisitor {
- /**
- * Operation performed on a SiteTreeNode
- * @param node The SiteTreeNode.
+ /**
+ * Operation performed on a SiteTreeNode
+ * @param node The SiteTreeNode.
*
* @throws DocumentException if an error occurs
- */
- void visitSiteTreeNode(SiteTreeNode node) throws DocumentException;
+ */
+ void visitSiteTreeNode(SiteTreeNode node) throws DocumentException;
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java Tue Feb 10 01:37:33 2009
@@ -25,10 +25,12 @@
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.LockException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.RepositoryException;
+import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
@@ -39,7 +41,7 @@
/**
* Site tree implementation which delegates all operations to a shared site tree.
*/
-public class DelegatingSiteTree implements SiteStructure, SiteTree {
+public class DelegatingSiteTree implements SiteStructure, SiteTree, RepositoryItem {
private Area area;
private Map links = new HashMap();
@@ -212,4 +214,110 @@
throw new UnsupportedOperationException();
}
+ public void checkin() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkin();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout(boolean restrictedToSession)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout(restrictedToSession);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void forceCheckIn() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().forceCheckIn();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public String getCheckoutUserId() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().getCheckoutUserId();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public org.apache.lenya.cms.publication.Session getSession() {
+ return this.area.getPublication().getSession();
+ }
+
+ public String getSourceURI() {
+ return getRepositoryNode().getSourceURI();
+ }
+
+ public boolean isCheckedOut() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOut();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isCheckedOutBySession(String sessionId, String userId)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOutBySession(sessionId, userId);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isLocked() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isLocked();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void lock() throws LockException, org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().lock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void registerDirty() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().registerDirty();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void rollback(int revision) throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().rollback(revision);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void unlock() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().unlock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java Tue Feb 10 01:37:33 2009
@@ -49,7 +49,6 @@
String[] snippets = key.split(":");
String publicationId = snippets[0];
String areaName = snippets[1];
- SiteTree tree;
try {
org.apache.lenya.cms.publication.Session pubSession = (org.apache.lenya.cms.publication.Session) session;
Publication publication = pubSession.getPublication(publicationId);
@@ -57,14 +56,13 @@
Session storeSession = getSharedItemStore().getSession();
if (session.isModifiable() || session == storeSession) {
- tree = new SiteTreeImpl(area, getLogger());
+ return new SiteTreeImpl(area, getLogger());
} else {
- tree = new DelegatingSiteTree(area, this, storeSession, key);
+ return new DelegatingSiteTree(area, this, storeSession, key);
}
} catch (Exception e) {
throw new RepositoryException(e);
}
- return tree;
}
public String getItemType() {
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java Tue Feb 10 01:37:33 2009
@@ -26,11 +26,13 @@
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.LockException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.repository.NodeFactory;
import org.apache.lenya.cms.repository.Persistable;
import org.apache.lenya.cms.repository.RepositoryException;
+import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
@@ -43,7 +45,7 @@
* Simple site tree implementation.
*/
public class SiteTreeImpl extends AbstractLogEnabled implements SiteStructure, SiteTree,
- Persistable {
+ Persistable, RepositoryItem {
private Area area;
private RootNode root;
@@ -415,4 +417,110 @@
this.revision = revision;
}
+ public void checkin() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkin();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void checkout(boolean restrictedToSession)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().checkout(restrictedToSession);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void forceCheckIn() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().forceCheckIn();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public String getCheckoutUserId() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().getCheckoutUserId();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public org.apache.lenya.cms.publication.Session getSession() {
+ return this.area.getPublication().getSession();
+ }
+
+ public String getSourceURI() {
+ return getRepositoryNode().getSourceURI();
+ }
+
+ public boolean isCheckedOut() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOut();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isCheckedOutBySession(String sessionId, String userId)
+ throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isCheckedOutBySession(sessionId, userId);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public boolean isLocked() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ return getRepositoryNode().isLocked();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void lock() throws LockException, org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().lock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void registerDirty() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().registerDirty();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void rollback(int revision) throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().rollback(revision);
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
+ public void unlock() throws org.apache.lenya.cms.publication.RepositoryException {
+ try {
+ getRepositoryNode().unlock();
+ } catch (RepositoryException e) {
+ throw new org.apache.lenya.cms.publication.RepositoryException(e);
+ }
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java Tue Feb 10 01:37:33 2009
@@ -18,8 +18,8 @@
package org.apache.lenya.cms.site.usecases;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.site.tree.SiteTree;
import org.apache.lenya.cms.site.tree.SiteTreeNode;
@@ -91,7 +91,7 @@
protected Node[] getNodesToLock() throws UsecaseException {
Node[] nodes = new Node[0];
if (getSourceDocument() != null) {
- Node node = getSourceDocument().area().getSite().getRepositoryNode();
+ Node node = getSourceDocument().area().getSite();
nodes = new Node[] { node };
}
return nodes;
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml Tue Feb 10 01:37:33 2009
@@ -16,8 +16,21 @@
<name>Apache Lenya Module Source Repository</name>
<dependencies>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
+ <!-- TODO: remove dependency to Lenya core API and impl -->
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java Tue Feb 10 01:37:33 2009
@@ -19,9 +19,9 @@
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
-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.repository.metadata.MetaData;
+import org.apache.lenya.cms.repository.metadata.MetaDataException;
+import org.apache.lenya.cms.repository.metadata.MetaDataOwner;
/**
* Provides access to a meta data source.
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java Tue Feb 10 01:37:33 2009
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.cms.metadata.MetaDataException;
+import org.apache.lenya.cms.repository.metadata.MetaDataException;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Element;
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java Tue Feb 10 01:37:33 2009
@@ -25,17 +25,17 @@
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.TraversableSource;
-import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
-import org.apache.lenya.cms.metadata.MetaData;
-import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.cms.observation.DocumentEvent;
import org.apache.lenya.cms.observation.RepositoryEvent;
import org.apache.lenya.cms.observation.RepositoryEventFactory;
+import org.apache.lenya.cms.publication.IdentityWrapper;
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;
import org.apache.lenya.transaction.Lock;
import org.apache.lenya.transaction.TransactionException;
import org.apache.lenya.transaction.Transactionable;
@@ -85,9 +85,9 @@
protected String getUserId() {
String userId = null;
- Identity identity = getRepositorySession().getIdentity();
+ IdentityWrapper identity = (IdentityWrapper) getRepositorySession().getIdentity();
if (identity != null) {
- User user = identity.getUser();
+ User user = identity.getIdentity().getUser();
if (user != null) {
userId = user.getId();
}
@@ -102,7 +102,8 @@
RCML rcml = getRcml();
synchronized (rcml) {
try {
- if (!rcml.isCheckedOutBySession(getRepositorySession())) {
+ if (!rcml.isCheckedOutBySession(getRepositorySession().getId(),
+ getRepositorySession().getIdentity().getUserId())) {
throw new RepositoryException("Cannot check in node [" + getSourceURI()
+ "]: not checked out by this session!");
}
@@ -139,9 +140,10 @@
}
}
- public boolean isCheckedOutBySession(Session session) throws RepositoryException {
+ public boolean isCheckedOutBySession(String sessionId, String userId)
+ throws RepositoryException {
try {
- return getRcml().isCheckedOutBySession(session);
+ return getRcml().isCheckedOutBySession(sessionId, userId);
} catch (RevisionControlException e) {
throw new RepositoryException(e);
}
@@ -155,7 +157,9 @@
RCML rcml = getRcml();
synchronized (rcml) {
try {
- if (rcml.isCheckedOut() && !rcml.isCheckedOutBySession(getRepositorySession())) {
+ if (rcml.isCheckedOut()
+ && !rcml.isCheckedOutBySession(getRepositorySession().getId(),
+ getRepositorySession().getIdentity().getUserId())) {
throw new RepositoryException("The node [" + this
+ "] is already checked out by another session!");
}
@@ -294,8 +298,8 @@
java.util.Vector newChildren = new java.util.Vector();
while (iterator.hasNext()) {
TraversableSource child = (TraversableSource) iterator.next();
- newChildren.add(new SourceNode(getRepositorySession(),
- getSourceURI() + "/" + child.getName(), getSourceResolver(), getLogger()));
+ newChildren.add(new SourceNode(getRepositorySession(), getSourceURI() + "/"
+ + child.getName(), getSourceResolver(), getLogger()));
}
return newChildren;
} catch (Exception e) {
@@ -345,8 +349,7 @@
}
protected void enqueueEvent(Object descriptor) {
- RepositoryEvent event = RepositoryEventFactory.createEvent(this, getLogger(),
- descriptor);
+ RepositoryEvent event = RepositoryEventFactory.createEvent(this, descriptor);
getRepositorySession().enqueueEvent(event);
}
@@ -492,7 +495,8 @@
}
public boolean isCheckedOutBySession() throws TransactionException {
- return isCheckedOutBySession(getRepositorySession());
+ return isCheckedOutBySession(getRepositorySession().getId(), getRepositorySession()
+ .getIdentity().getUserId());
}
public void setPersistable(Persistable item) throws RepositoryException {
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java Tue Feb 10 01:37:33 2009
@@ -22,11 +22,11 @@
import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
-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;
+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;
/**
* Source-node-based meta data.
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java Tue Feb 10 01:37:33 2009
@@ -25,13 +25,13 @@
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
-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.cms.metadata.dublincore.DublinCore;
import org.apache.lenya.cms.publication.PageEnvelope;
+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.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Document;
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java Tue Feb 10 01:37:33 2009
@@ -29,14 +29,15 @@
import java.util.Map;
import java.util.Vector;
+import org.apache.commons.lang.Validate;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
+import org.apache.lenya.cms.publication.IdentityWrapper;
import org.apache.lenya.cms.rc.CheckInEntry;
import org.apache.lenya.cms.rc.CheckOutEntry;
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.util.Assert;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Document;
@@ -118,7 +119,7 @@
*/
public synchronized void write() throws RevisionControlException {
NamespaceHelper helper = saveToXml();
- Assert.notNull("XML document", helper);
+ Validate.notNull(helper, "XML document");
try {
SourceUtil.writeDOM(helper.getDocument(), getRcmlSourceUri(), getSourceResolver());
} catch (Exception e) {
@@ -143,7 +144,8 @@
public synchronized void checkOutIn(Node node, short type, long time, boolean backup,
boolean newVersion, boolean restrictedToSession) throws RevisionControlException {
- String identity = node.getRepositorySession().getIdentity().getUser().getId();
+ IdentityWrapper wrapper = (IdentityWrapper) node.getRepositorySession().getIdentity();
+ String identity = wrapper.getIdentity().getUser().getId();
Vector entries = getEntries();
if (entries.size() == 0) {
@@ -609,7 +611,7 @@
write();
}
- public boolean isCheckedOutBySession(Session session) throws RevisionControlException {
+ public boolean isCheckedOutBySession(String sessionId, String userId) throws RevisionControlException {
Vector entries = getEntries();
if (entries.size() > 0) {
RCMLEntry entry = (RCMLEntry) entries.get(0);
@@ -618,11 +620,10 @@
// not restricted to session
if (otherSessionId.equals(ALL_SESSIONS)) {
String otherUserId = entry.getIdentity();
- String userId = session.getIdentity().getUser().getId();
return userId.equals(otherUserId);
}
// restricted to session
- if (otherSessionId.equals(session.getId())) {
+ if (otherSessionId.equals(sessionId)) {
return true;
}
}
Modified: 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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java?rev=742812&r1=742811&r2=742812&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.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java Tue Feb 10 01:37:33 2009
@@ -26,11 +26,11 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
-import org.apache.lenya.cms.metadata.MetaData;
-import org.apache.lenya.cms.metadata.MetaDataException;
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;
/**
* Revision implementation.
Modified: lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java (original)
+++ lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java Tue Feb 10 01:37:33 2009
@@ -28,6 +28,7 @@
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.linking.LinkConverter;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -52,8 +53,8 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
- org.apache.lenya.cms.repository.Node[] objects = { getSourceDocument().getRepositoryNode() };
+ protected Node[] getNodesToLock() throws UsecaseException {
+ Node[] objects = { getSourceDocument() };
return objects;
}
@@ -170,7 +171,7 @@
LinkConverter converter = new LinkConverter(getLogger());
converter.convertUrlsToUuids(doc, false);
- WorkflowUtil.invoke(getLogger(), doc, getEvent());
+ WorkflowUtil.invoke(doc, getEvent());
}
/**
Modified: lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java Tue Feb 10 01:37:33 2009
@@ -22,7 +22,6 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.usecases.SiteUsecase;
/**
@@ -53,9 +52,8 @@
Document doc = getTargetDocument(false);
docs.add(doc);
- Node node = doc.getRepositoryNode();
- if (node.isCheckedOut()) {
- checkedOut.add(node.getCheckoutUserId());
+ if (doc.isCheckedOut()) {
+ checkedOut.add(doc.getCheckoutUserId());
}
else {
checkedOut.add(null);
Modified: lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java Tue Feb 10 01:37:33 2009
@@ -23,7 +23,6 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.usecases.SiteUsecase;
/**
@@ -74,10 +73,8 @@
test = test + "/";
if (test.equals(request)) {
docs.add(documents[i]);
-
- Node node = documents[i].getRepositoryNode();
- if (node.isCheckedOut()) {
- checkedOut.add(node.getCheckoutUserId());
+ if (documents[i].isCheckedOut()) {
+ checkedOut.add(documents[i].getCheckoutUserId());
}
else {
checkedOut.add(null);
Modified: lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java (original)
+++ lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java Tue Feb 10 01:37:33 2009
@@ -31,9 +31,9 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.publication.ResourceTypeResolver;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.site.SiteUtil;
@@ -135,7 +135,7 @@
String event = getParameterAsString(EVENT);
if (event != null) {
- WorkflowUtil.invoke(getLogger(), doc, event);
+ WorkflowUtil.invoke(doc, event);
}
}
@@ -177,11 +177,11 @@
NodeSet set = SiteUtil.getSubSite(doc.getLink().getNode());
Document[] documents = set.getDocuments();
for (int i = 0; i < documents.length; i++) {
- nodes.add(documents[i].getRepositoryNode());
+ nodes.add(documents[i]);
}
SiteStructure structure = getSourceDocument().area().getSite();
- nodes.add(structure.getRepositoryNode());
+ nodes.add(structure);
return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml Tue Feb 10 01:37:33 2009
@@ -53,6 +53,10 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-sourcerepository</artifactId>
</dependency>
</dependencies>
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java Tue Feb 10 01:37:33 2009
@@ -60,7 +60,7 @@
Area area = pub.getArea(areas[i]);
Document[] docs = area.getDocuments();
for (int j = 0; j < docs.length; j++) {
- nodes.add(docs[j].getRepositoryNode());
+ nodes.add(docs[j]);
/*
* final String lenyaUri = docs[j].getSourceURI(); final String sourcePath =
* lenyaUri.substring("lenya://".length()); final String contextUri = "context://" +
@@ -68,7 +68,7 @@
* this.manager, getLogger()); uri2meta.put(docs[j].getSourceURI(), meta);
*/
}
- nodes.add(area.getSite().getRepositoryNode());
+ nodes.add(area.getSite());
}
for (Iterator i = nodes.iterator(); i.hasNext();) {
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Tue Feb 10 01:37:33 2009
@@ -310,6 +310,11 @@
<version>1.5</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
@@ -559,6 +564,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-sitemanagement</artifactId>
<version>${project.version}</version>
</dependency>
@@ -601,6 +611,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-simplesite</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-sitetree</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lenya/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/pom.xml (original)
+++ lenya/trunk/pom.xml Tue Feb 10 01:37:33 2009
@@ -49,6 +49,7 @@
<module>org.apache.lenya.core.monitoring</module>
<module>org.apache.lenya.core.observation</module>
<module>org.apache.lenya.core.properties</module>
+ <module>org.apache.lenya.core.repository</module>
<module>org.apache.lenya.core.sitemanagement</module>
<module>org.apache.lenya.core.templating</module>
<module>org.apache.lenya.core.usecase</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org