You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/06/21 17:47:07 UTC
svn commit: r416011 - in /lenya/trunk/src:
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/repository/ modules/sourcerepository/
modules/sourcerepository/config/
modules/sourcerepository/config/cocoon-xconf/ modules/sourcerepository/ja...
Author: andreas
Date: Wed Jun 21 08:47:06 2006
New Revision: 416011
URL: http://svn.apache.org/viewvc?rev=416011&view=rev
Log:
Moved SourceNode + factory to separate module
Added:
lenya/trunk/src/modules/sourcerepository/
lenya/trunk/src/modules/sourcerepository/config/
lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/
lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/sourcenodefactory.xconf
lenya/trunk/src/modules/sourcerepository/java/
lenya/trunk/src/modules/sourcerepository/java/src/
lenya/trunk/src/modules/sourcerepository/java/src/org/
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java (contents, props changed)
- copied, changed from r415937, lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeFactory.java (props changed)
- copied unchanged from r415937, lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNodeFactory.java
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/Resource.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Resource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/Resource.java?rev=416011&r1=416010&r2=416011&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Resource.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Resource.java Wed Jun 21 08:47:06 2006
@@ -29,7 +29,6 @@
import org.apache.lenya.cms.metadata.MetaDataManager;
import org.apache.lenya.cms.metadata.MetaDataOwner;
import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.repository.SourceNode;
/**
* A resource (asset).
@@ -44,6 +43,9 @@
private MetaDataManager metaDataManager;
private String contentDir = null;
+ protected static final String FILE_PREFIX = "file:/";
+ protected static final String CONTEXT_PREFIX = "context://";
+
/**
* Ctor.
* @param document The document the resource belongs to.
@@ -124,14 +126,14 @@
if (contentDir == null) {
// Default
- realSourceURI = SourceNode.CONTEXT_PREFIX + Publication.PUBLICATION_PREFIX_URI + "/" +publicationId+ "/" +urlID;
+ realSourceURI = CONTEXT_PREFIX + Publication.PUBLICATION_PREFIX_URI + "/" +publicationId+ "/" +urlID;
} else {
if (new File(contentDir).isAbsolute()) {
// Absolute
- realSourceURI = SourceNode.FILE_PREFIX + contentDir + File.separator+urlID;
+ realSourceURI = FILE_PREFIX + contentDir + File.separator+urlID;
} else {
// Relative
- realSourceURI = SourceNode.CONTEXT_PREFIX + contentDir + File.separator+urlID;
+ realSourceURI = CONTEXT_PREFIX + contentDir + File.separator+urlID;
}
}
if (getLogger().isDebugEnabled()) {
Added: lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/sourcenodefactory.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/sourcenodefactory.xconf?rev=416011&view=auto
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/sourcenodefactory.xconf (added)
+++ lenya/trunk/src/modules/sourcerepository/config/cocoon-xconf/sourcenodefactory.xconf Wed Jun 21 08:47:06 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xconf xpath="/cocoon" unless="/cocoon/component[@class = 'org.apache.lenya.cms.repository.SourceNodeFactory']">
+ <component
+ logger="lenya.nodefactory.source"
+ role="org.apache.lenya.cms.repository.NodeFactory"
+ class="org.apache.lenya.cms.repository.SourceNodeFactory"/>
+</xconf>
\ No newline at end of file
Copied: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java (from r415937, lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java?p2=lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java&p1=lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java&r1=415937&r2=416011&rev=416011&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java Wed Jun 21 08:47:06 2006
@@ -56,9 +56,9 @@
private String sourceURI;
protected ServiceManager manager;
- public static final String FILE_PREFIX = "file:/";
- public static final String CONTEXT_PREFIX = "context://";
- public static final String LENYA_META_SUFFIX = "meta";
+ protected static final String FILE_PREFIX = "file:/";
+ protected static final String CONTEXT_PREFIX = "context://";
+ protected static final String LENYA_META_SUFFIX = "meta";
/**
* Ctor.
Propchange: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org