You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/03/18 10:02:09 UTC
svn commit: r158039 - in
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms:
cocoon/transformation/AccessControlSitetreeTransformer.java
publication/AbstractPublication.java publication/DefaultSiteTree.java
publication/Publication.java publication/SiteTree.java
publication/SiteTreeNodeImpl.java
Author: michi
Date: Fri Mar 18 01:02:06 2005
New Revision: 158039
URL: http://svn.apache.org/viewcvs?view=rev&rev=158039
Log:
DefaultSiteTree replaced by interface SiteTree and static parameters centralized
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTree.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTreeNodeImpl.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java Fri Mar 18 01:02:06 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: AccessControlSitetreeTransformer.java,v 1.7 2004/03/01 16:18:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.transformation;
@@ -41,7 +41,7 @@
import org.apache.lenya.ac.Role;
import org.apache.lenya.ac.impl.DefaultAccessController;
import org.apache.lenya.ac.impl.PolicyAuthorizer;
-import org.apache.lenya.cms.publication.DefaultSiteTree;
+import org.apache.lenya.cms.publication.SiteTree;
import org.apache.lenya.cms.publication.SiteTreeNodeImpl;
import org.apache.lenya.util.ServletHelper;
import org.xml.sax.Attributes;
@@ -223,7 +223,7 @@
* @return A boolean value.
*/
protected boolean isNode(String uri, String localName) {
- return uri.equals(DefaultSiteTree.NAMESPACE_URI)
+ return uri.equals(SiteTree.NAMESPACE_URI)
&& (localName.equals(SiteTreeNodeImpl.NODE_NAME) || localName.equals("site"));
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Fri Mar 18 01:02:06 2005
@@ -319,13 +319,13 @@
*
* @throws SiteTreeException if an error occurs
*/
- public DefaultSiteTree getSiteTree(String area) throws SiteTreeException {
+ public SiteTree getSiteTree(String area) throws SiteTreeException {
- DefaultSiteTree sitetree = null;
+ SiteTree sitetree = null;
if (hasSitetree) {
if (siteTrees.containsKey(area)) {
- sitetree = (DefaultSiteTree) siteTrees.get(area);
+ sitetree = (SiteTree) siteTrees.get(area);
} else {
sitetree = new DefaultSiteTree(getDirectory(), area);
siteTrees.put(area, sitetree);
@@ -603,4 +603,4 @@
public String[] getRewriteAttributeXPaths() {
return this.rewriteAttributeXPaths;
}
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java Fri Mar 18 01:02:06 2005
@@ -40,13 +40,10 @@
import org.xml.sax.SAXException;
/**
- * DOCUMENT ME!
+ * Default Sitetree implementation
*/
public class DefaultSiteTree implements SiteTree {
private static Category log = Category.getInstance(DefaultSiteTree.class);
-
- public static final String NAMESPACE_URI = "http://apache.org/cocoon/lenya/sitetree/1.0";
- public static final String SITE_TREE_FILENAME = "sitetree.xml";
private Document document = null;
private File treefile = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java Fri Mar 18 01:02:06 2005
@@ -160,7 +160,7 @@
*
* @throws SiteTreeException if an error occurs
*/
- DefaultSiteTree getSiteTree(String area) throws SiteTreeException;
+ SiteTree getSiteTree(String area) throws SiteTreeException;
/**
* Returns the document builder of this instance.
@@ -239,4 +239,4 @@
*/
String[] getRewriteAttributeXPaths();
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTree.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTree.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTree.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTree.java Fri Mar 18 01:02:06 2005
@@ -21,6 +21,9 @@
public interface SiteTree {
+ public static final String NAMESPACE_URI = "http://apache.org/cocoon/lenya/sitetree/1.0";
+ public static final String SITE_TREE_FILENAME = "sitetree.xml";
+
/**
* Add a node.
*
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTreeNodeImpl.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTreeNodeImpl.java?view=diff&r1=158038&r2=158039
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTreeNodeImpl.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/SiteTreeNodeImpl.java Fri Mar 18 01:02:06 2005
@@ -447,7 +447,7 @@
*/
protected NamespaceHelper getNamespaceHelper() {
NamespaceHelper helper =
- new NamespaceHelper(DefaultSiteTree.NAMESPACE_URI, "", node.getOwnerDocument());
+ new NamespaceHelper(SiteTree.NAMESPACE_URI, "", node.getOwnerDocument());
return helper;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r158039 - in lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms:
cocoon/transformation/AccessControlSitetreeTransformer.java publication/AbstractPublication.java
publication/DefaultSiteTree.java publication/Publication.java publication/SiteTree.java
publication/SiteTreeNodeImpl.java
Posted by Michael Wechner <mi...@wyona.com>.
Andreas Hartmann wrote:
>
> [...]
>
>> public interface SiteTree {
>>
>> + public static final String NAMESPACE_URI =
>> "http://apache.org/cocoon/lenya/sitetree/1.0";
>
>
>
>> + public static final String SITE_TREE_FILENAME = "sitetree.xml";
>
>
> This shouldn't be in the SiteTree interface. It is an implementation
> detail that should be encapsulated. Furthermore, the file-based storage
> is not a default for all sitetree implementations.
right, I moved this one back to the DefaultSiteTree
Thanks for poiting it out
Michi
>
> -- Andreas
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
> For additional commands, e-mail: dev-help@lenya.apache.org
>
>
--
Michael Wechner
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r158039 - in lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms:
cocoon/transformation/AccessControlSitetreeTransformer.java publication/AbstractPublication.java
publication/DefaultSiteTree.java publication/Publication.java publication/SiteTree.java
publication/SiteTreeNodeImpl.java
Posted by Andreas Hartmann <an...@apache.org>.
[...]
> public interface SiteTree {
>
> + public static final String NAMESPACE_URI = "http://apache.org/cocoon/lenya/sitetree/1.0";
> + public static final String SITE_TREE_FILENAME = "sitetree.xml";
This shouldn't be in the SiteTree interface. It is an implementation
detail that should be encapsulated. Furthermore, the file-based storage
is not a default for all sitetree implementations.
-- Andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org