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/11/02 14:33:27 UTC
svn commit: r330247 - in
/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms: authoring/
cocoon/acting/
Author: michi
Date: Wed Nov 2 05:33:19 2005
New Revision: 330247
URL: http://svn.apache.org/viewcvs?rev=330247&view=rev
Log:
getChildFileName fixed such that one is forced to upgrade the creators because of the DocumentIdToPathMapper bug
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultLeafCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/ParentChildCreatorInterface.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultBranchCreator.java Wed Nov 2 05:33:19 2005
@@ -21,6 +21,8 @@
import org.apache.log4j.Category;
+import org.apache.lenya.cms.publication.Publication;
+
import java.io.File;
public class DefaultBranchCreator extends DefaultCreator {
@@ -44,19 +46,12 @@
* @see org.apache.lenya.cms.authoring.DefaultCreator#getChildFileName(java.io.File, java.lang.String)
*/
protected String getChildFileName(
- File parentDir,
+ Publication publication,
+ String area,
+ String parentId,
String childId,
String language) {
-
- log.warn("This method has the filename creation hardcoded, resp. the DocumentIdToPathMapper should be used!");
-
- return parentDir
- + File.separator
- + childId
- + File.separator
- + "index"
- + getLanguageSuffix(language)
- + ".xml";
+ return publication.getPathMapper().getFile(publication, area, parentId + "/" + childId, language).getAbsolutePath();
}
/** (non-Javadoc)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java Wed Nov 2 05:33:19 2005
@@ -29,7 +29,7 @@
import org.apache.log4j.Category;
import org.w3c.dom.Document;
-public class DefaultCreator implements ParentChildCreatorInterface {
+public abstract class DefaultCreator implements ParentChildCreatorInterface {
private static Category log = Category.getInstance(DefaultCreator.class);
public static final String RESOURCE_NAME = "resource-name";
public static final String RESOURCE_META_NAME = "resource-meta-name";
@@ -143,7 +143,7 @@
throws Exception {
// Set filenames
String id = generateTreeId(childId, childType);
- String filename = publication.getPathMapper().getFile(publication, "authoring", parentId + "/" + id, language).getAbsolutePath();
+ String filename = getChildFileName(publication, "authoring", parentId, childId, language);
log.debug("Filename: " + filename);
String filenameMeta = getChildMetaFileName(parentDir, id, language);
@@ -211,6 +211,7 @@
*
* @throws Exception DOCUMENT ME!
*/
+ /*
public void create(
File samplesDir,
File parentDir,
@@ -223,6 +224,7 @@
log.warn("Deprecated!");
}
+ */
/**
* Apply some transformation on the newly created child.
@@ -272,12 +274,12 @@
*
* @return the file name of the child
*/
- protected String getChildFileName(
- File parentDir,
+ protected abstract String getChildFileName(
+ Publication publication,
+ String area,
+ String parentId,
String childId,
- String language) {
- return null;
- }
+ String language);
/**
* Get the file name of the meta file
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultLeafCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultLeafCreator.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultLeafCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DefaultLeafCreator.java Wed Nov 2 05:33:19 2005
@@ -15,12 +15,14 @@
*
*/
-/* $Id: DefaultLeafCreator.java,v 1.14 2004/03/03 12:56:32 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.authoring;
import java.io.File;
+import org.apache.lenya.cms.publication.Publication;
+
public class DefaultLeafCreator extends DefaultCreator {
/**
* Return the child type.
@@ -39,10 +41,12 @@
* @see org.apache.lenya.cms.authoring.DefaultCreator#getChildFileName(java.io.File, java.lang.String)
*/
protected String getChildFileName(
- File parentDir,
+ Publication publication,
+ String area,
+ String parentId,
String childId,
String language) {
- return parentDir + File.separator + childId + getLanguageSuffix(language) + ".xml";
+ return publication.getPathMapper().getFile(publication, area, parentId + "/" + childId, language).getAbsolutePath();
}
/** (non-Javadoc)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/ParentChildCreatorInterface.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/ParentChildCreatorInterface.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/ParentChildCreatorInterface.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/ParentChildCreatorInterface.java Wed Nov 2 05:33:19 2005
@@ -123,6 +123,7 @@
*
* @exception Exception if an error occurs
*/
+/*
void create(
File samplesDir,
File parentDir,
@@ -132,4 +133,5 @@
String language,
Map parameters)
throws Exception;
+*/
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java Wed Nov 2 05:33:19 2005
@@ -256,8 +256,8 @@
}
try {
- creator.create(new File(absoluteDoctypesPath + "samples"),
- new File(publication.getDirectory(), docsPath + parentid), childid, childType,
+ creator.create(publication, new File(absoluteDoctypesPath + "samples"),
+ new File(publication.getDirectory(), docsPath + parentid), parentid, childid, childType,
childname, language, allParameters);
} catch (Exception e) {
log.error("Creator threw exception: " + e);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java?rev=330247&r1=330246&r2=330247&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java Wed Nov 2 05:33:19 2005
@@ -37,6 +37,8 @@
import org.apache.excalibur.source.Source;
import org.apache.lenya.cms.authoring.ParentChildCreatorInterface;
+import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.PublicationFactory;
import org.dom4j.Attribute;
import org.dom4j.Document;
@@ -175,8 +177,8 @@
creator = (ParentChildCreatorInterface) creatorClass.newInstance();
} else {
getLogger().warn("No creator found for \"" + doctype +
- "\". DefaultParentChildreator will be taken.");
- creator = new org.apache.lenya.cms.authoring.DefaultCreator();
+ "\". DefaultBranchCreator will be taken.");
+ creator = new org.apache.lenya.cms.authoring.DefaultBranchCreator();
}
getLogger().debug(".act(): Creator : " + creator.getClass().getName());
@@ -259,8 +261,9 @@
}
try {
- creator.create(new File(absoluteDoctypesPath + "samples"),
- new File(sitemapParentPath + docsPath + parentid), childid, childType, childname, language,
+ Publication publication = PublicationFactory.getPublication(objectModel);
+ creator.create(publication, new File(absoluteDoctypesPath + "samples"),
+ new File(sitemapParentPath + docsPath + parentid), parentid, childid, childType, childname, language,
allParameters);
} catch (Exception e) {
getLogger().error("Creator threw exception: " + e);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org