Author: andreas
Date: Fri May 19 05:43:17 2006
New Revision: 407783
URL: http://svn.apache.org/viewvc?rev=407783&view=rev
Log:
Removed deprecated + obsolete Creator interface. The functionality of the
NewBlogEntryCreator has been moved to the CreateBlogEntry usecase.
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/authoring/
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/authoring/
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf
lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
lenya/trunk/src/pubs/blog/config/cocoon-xconf/resourcetypes.xconf
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
Fri May 19 05:43:17 2006
@@ -16,7 +16,6 @@
*/
package org.apache.lenya.cms.publication;
-import java.util.Map;
import org.apache.lenya.cms.publication.util.DocumentSet;
/**
@@ -41,15 +40,16 @@
void copy(Document sourceDocument, Document destinationDocument) throws
PublicationException;
/**
- * Copies a document from one location to another location.
- * Does not copy the documents resources
+ * Copies a document from one location to another location. Does not copy
the documents
+ * resources
* @param sourceDocument The document to copy.
* @param destinationDocument The destination document.
* @throws PublicationException if a document which destinationDocument
depends on does not
* exist.
*/
- void copyDocument(Document sourceDocument, Document destinationDocument)
throws PublicationException;
-
+ void copyDocument(Document sourceDocument, Document destinationDocument)
+ throws PublicationException;
+
/**
* Copies a document to another area.
* @param sourceDocument The document to copy.
@@ -77,17 +77,13 @@
* @param extension The extension to use for the document source.
* @param navigationTitle navigation title
* @param visibleInNav determines the visibility of a node in the
navigation
- * @param parameters any parameters the caller needs to pass to the creator
*
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
- void add(Document document,
- ResourceType resourceType,
- String extension,
- String navigationTitle,
- boolean visibleInNav,
- Map parameters) throws DocumentBuildException,
PublicationException;
+ void add(Document document, ResourceType resourceType, String extension,
+ String navigationTitle, boolean visibleInNav) throws
DocumentBuildException,
+ PublicationException;
/**
* Creates a new document in the same publication the
<code>parentDocument</code> belongs to
@@ -98,17 +94,12 @@
* @param extension The extension to use for the document source.
* @param navigationTitle navigation title
* @param visibleInNav determines the visibility of a node in the
navigation
- * @param parameters any parameters the caller needs to pass to the creator
*
* @throws DocumentBuildException if the document can not be created
* @throws PublicationException if the document is already contained.
*/
- void add(Document document,
- Document sourceDocument,
- String extension,
- String navigationTitle,
- boolean visibleInNav,
- Map parameters) throws DocumentBuildException,
PublicationException;
+ void add(Document document, Document sourceDocument, String extension,
String navigationTitle,
+ boolean visibleInNav) throws DocumentBuildException,
PublicationException;
/**
* Deletes a document.
@@ -145,7 +136,7 @@
* exist.
*/
void copy(DocumentSet sources, DocumentSet destinations) throws
PublicationException;
-
+
/**
* Moves a document to another location, incl. all requiring documents. If
a sitetree is used,
* this means that the whole subtree is moved.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
(original)
+++
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
Fri May 19 05:43:17 2006
@@ -27,7 +27,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.lenya.cms.authoring.DocumentCreator;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.metadata.LenyaMetaData;
import org.apache.lenya.cms.metadata.MetaDataManager;
import org.apache.lenya.cms.publication.util.DocumentSet;
@@ -51,33 +52,31 @@
* implementation to be used is specified in doctypes.xconf (and thus
depends on the publication
* and the resource type to be used)
*
- * @see DocumentManager#add(Document, ResourceType, String, String,
boolean, Map)
+ * @see DocumentManager#add(Document, ResourceType, String, String,
boolean)
* @see org.apache.lenya.cms.authoring.DocumentCreator
* @see org.apache.lenya.cms.publication.DocumentBuilder
*/
public void add(Document document, ResourceType documentType, String
extension,
- String navigationTitle, boolean visibleInNav, Map parameters)
- throws DocumentBuildException, PublicationException {
+ String navigationTitle, boolean visibleInNav) throws
DocumentBuildException,
+ PublicationException {
String contentsURI = documentType.getSampleURI();
- add(document, documentType, extension, navigationTitle, visibleInNav,
parameters, contentsURI);
+ add(document, documentType, extension, navigationTitle, visibleInNav,
contentsURI);
}
/**
* @see
org.apache.lenya.cms.publication.DocumentManager#add(org.apache.lenya.cms.publication.Document,
- * org.apache.lenya.cms.publication.Document, String,
java.lang.String, boolean,
- * java.util.Map)
+ * org.apache.lenya.cms.publication.Document, String,
java.lang.String, boolean)
*/
public void add(Document document, Document sourceDocument, String
extension,
- String navigationTitle, boolean visibleInNav, Map parameters)
- throws DocumentBuildException, PublicationException {
+ String navigationTitle, boolean visibleInNav) throws
DocumentBuildException,
+ PublicationException {
String contentsURI = sourceDocument.getSourceURI();
add(document,
sourceDocument.getResourceType(),
extension,
navigationTitle,
visibleInNav,
- parameters,
contentsURI);
MetaDataManager mgr = document.getMetaDataManager();
MetaDataManager srcMgr = sourceDocument.getMetaDataManager();
@@ -93,15 +92,14 @@
* @param extension The extension for the document source.
* @param navigationTitle The navigation title.
* @param visibleInNav determines the visibility of a node in the
navigation
- * @param parameters The parameters for the creator.
* @param initialContentsURI A URI to read the contents from.
* @throws DocumentBuildException if an error occurs.
* @throws DocumentException if an error occurs.
* @throws PublicationException if an error occurs.
*/
- protected void add(Document document, ResourceType documentType, String
extension, String navigationTitle,
- boolean visibleInNav, Map parameters, String initialContentsURI)
+ protected void add(Document document, ResourceType documentType, String
extension,
+ String navigationTitle, boolean visibleInNav, String
initialContentsURI)
throws DocumentBuildException, DocumentException,
PublicationException {
try {
@@ -123,15 +121,31 @@
getLogger().debug(" contents URI: [" + initialContentsURI +
"]");
}
- // look up creator for documents of this type
- DocumentCreator creator = documentType.getCreator();
- creator.create(initialContentsURI, document, parameters);
+ create(initialContentsURI, document);
} catch (Exception e) {
throw new DocumentBuildException("call to creator for new document
failed", e);
}
// Notify site manager about new document
addToSiteManager(document, navigationTitle, visibleInNav);
+ }
+
+ protected void create(String initialContentsURI, Document document) throws
Exception {
+
+ // Read initial contents as DOM
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("DefaultCreator::create(), ready to read initial
contents from URI ["
+ + initialContentsURI + "]");
+
+ SourceResolver resolver = null;
+ try {
+ resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ SourceUtil.copy(resolver, initialContentsURI,
document.getSourceURI());
+ } finally {
+ if (resolver != null) {
+ this.manager.release(resolver);
+ }
+ }
}
private void addToSiteManager(Document document, String navigationTitle,
boolean visibleInNav)
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java Fri
May 19 05:43:17 2006
@@ -32,7 +32,6 @@
*/
package org.apache.lenya.cms.publication;
-import org.apache.lenya.cms.authoring.DocumentCreator;
import org.apache.lenya.xml.Schema;
/**
@@ -80,11 +79,6 @@
*/
void setSampleURI(String name);
- /**
- * @return The creator.
- */
- DocumentCreator getCreator();
-
/**
* @param name The name of the resource type.
*/
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
Fri May 19 05:43:17 2006
@@ -18,21 +18,16 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Iterator;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.lenya.cms.authoring.DefaultBranchCreator;
-import org.apache.lenya.cms.authoring.DocumentCreator;
import org.apache.lenya.xml.Schema;
/**
@@ -40,11 +35,10 @@
*
* @version $Id:$
*/
-public class ResourceTypeImpl extends AbstractLogEnabled implements
Configurable, Serviceable,
- ThreadSafe, ResourceType {
+public class ResourceTypeImpl extends AbstractLogEnabled implements
Configurable, ThreadSafe,
+ ResourceType {
protected static final String SCHEMA_ELEMENT = "schema";
- protected static final String CREATOR_ELEMENT = "creator";
protected static final String SRC_ATTRIBUTE = "src";
protected static final String ELEMENT_REWRITE_ATTRIBUTE = "link-attribute";
protected static final String ATTRIBUTE_XPATH = "xpath";
@@ -60,7 +54,6 @@
private String defaultSampleUri = null;
private Map sampleUris = new HashMap();
private String[] linkAttributeXPaths;
- private DocumentCreator creator;
/**
* @see
org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
@@ -77,28 +70,15 @@
this.schema = new Schema(language, uri);
}
- Configuration creatorConf = config.getChild(CREATOR_ELEMENT,
false);
-
- if (creatorConf != null) {
- String creatorClassName =
creatorConf.getAttribute(SRC_ATTRIBUTE);
- Class creatorClass = Class.forName(creatorClassName);
- this.creator = (DocumentCreator) creatorClass.newInstance();
- this.creator.init(creatorConf, manager, getLogger());
- } else {
- creator = new DefaultBranchCreator();
- }
-
// determine the sample content locations.
- if (creatorConf != null) {
- Configuration[] samplesConf =
creatorConf.getChildren(SAMPLE_NAME);
- for (int i = 0; i < samplesConf.length; i++) {
- if (samplesConf[i].getAttributeNames().length > 0)
-
this.sampleUris.put(samplesConf[i].getAttribute(SAMPLE_NAME_ATTRIBUTE),
- samplesConf[i].getValue());
- else { // default sample doesn't have name attribute
- this.sampleUri = samplesConf[i].getValue();
- this.defaultSampleUri = samplesConf[i].getValue();
- }
+ Configuration[] samplesConf = config.getChildren(SAMPLE_NAME);
+ for (int i = 0; i < samplesConf.length; i++) {
+ if (samplesConf[i].getAttributeNames().length > 0)
+
this.sampleUris.put(samplesConf[i].getAttribute(SAMPLE_NAME_ATTRIBUTE),
+ samplesConf[i].getValue());
+ else { // default sample doesn't have name attribute
+ this.sampleUri = samplesConf[i].getValue();
+ this.defaultSampleUri = samplesConf[i].getValue();
}
}
@@ -123,15 +103,6 @@
}
- private ServiceManager manager;
-
- /**
- * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
public Schema getSchema() {
return this.schema;
}
@@ -159,10 +130,6 @@
public String getSampleURI() {
return this.sampleUri;
- }
-
- public DocumentCreator getCreator() {
- return this.creator;
}
public void setName(String name) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java Fri May
19 05:43:17 2006
@@ -154,16 +154,14 @@
resourceType,
getSourceExtension(),
getParameterAsString(DublinCore.ELEMENT_TITLE),
- getVisibleInNav(),
- null);
+ getVisibleInNav());
resourceType.setSampleURI(""); // reset to default sample
} else {
documentManager.add(document,
initialDocument,
getSourceExtension(),
getParameterAsString(DublinCore.ELEMENT_TITLE),
- getVisibleInNav(),
- null);
+ getVisibleInNav());
}
setMetaData(document);
@@ -184,7 +182,7 @@
}
}
-
+
/**
* @return the extension to use for the document source.
*/
Modified: lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf Fri May 19
05:43:17 2006
@@ -23,9 +23,7 @@
logger="lenya.resourcetypes.cforms"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema src="fallback://lenya/modules/cforms/schemas/cforms.rng"
language="http://relaxng.org/ns/structure/0.9"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
-
<sample-name>fallback://lenya/modules/cforms/samples/cforms.xml</sample-name>
- </creator>
+
<sample-name>fallback://lenya/modules/cforms/samples/cforms.xml</sample-name>
<link-attribute xpath="//*[namespace-uri() =
'http://www.w3.org/1999/xhtml']/@href"/>
<format name="xhtml" uri="cocoon://modules/cforms/xhtml.xml"/>
</component-instance>
Modified:
lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
(original)
+++ lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
Fri May 19 05:43:17 2006
@@ -24,9 +24,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9";
src="fallback://lenya/modules/links/resources/schema/links.rng"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
-
<sample-name>fallback://lenya/modules/links/samples/links.xml</sample-name>
- </creator>
+ <sample-name>fallback://lenya/modules/links/samples/links.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/links/xhtml.xml"/>
<format name="luceneIndex" uri="cocoon://modules/xhtml/lucene-index.xml"/>
<format name="webdavGET" uri="cocoon://modules/xhtml/davget.xml"/>
Modified:
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
(original)
+++
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
Fri May 19 05:43:17 2006
@@ -22,9 +22,7 @@
<component-instance name="opendocument"
logger="lenya.resourcetypes.opendocument"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
-
<sample-name>fallback://lenya/modules/opendocument/samples/helloworld.odt</sample-name>
- </creator>
+
<sample-name>fallback://lenya/modules/opendocument/samples/helloworld.odt</sample-name>
<!-- NOTE: Will be matched within sitemap of this module
(modules/opendocument/sitemap.xmap) -->
<format name="xhtml" uri="cocoon://modules/opendocument/xhtml.xml"/>
<format name="webdavGET" uri="cocoon://modules/opendocument/davget.xml"/>
Modified:
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
(original)
+++
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
Fri May 19 05:43:17 2006
@@ -85,7 +85,7 @@
doc.getLanguage());
resourceType = (ResourceType) selector.select(TYPE);
- documentManager.add(document, resourceType, EXTENSION,
doc.getName(), true, null);
+ documentManager.add(document, resourceType, EXTENSION,
doc.getName(), true);
setMetaData(document);
doc = document;
Modified:
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
(original)
+++
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
Fri May 19 05:43:17 2006
@@ -111,7 +111,7 @@
doc.getLanguage());
//lookupResourceType(extension)
resourceType = lookUpExtension(extension, selector);
- documentManager.add(document, resourceType, extension,
doc.getName(), true, null);
+ documentManager.add(document, resourceType, extension,
doc.getName(), true);
setMetaData(document);
doc = document;
} finally {
Modified:
lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
(original)
+++ lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
Fri May 19 05:43:17 2006
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,20 +18,20 @@
<!-- $Id: doctypes.xconf 164635 2005-04-25 20:01:43Z tschlabach $ -->
<xconf xpath="/cocoon/resource-types"
unless="/cocoon/resource-types/component-instance[@name = 'xhtml']">
-
+
<component-instance name="xhtml"
- logger="lenya.resourcetypes.xhtml"
-
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
+ logger="lenya.resourcetypes.xhtml"
+ class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9";
- src="fallback://lenya/modules/xhtml/resources/schemas/xhtml.rng"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
-
<sample-name>fallback://lenya/modules/xhtml/samples/xhtml.xml</sample-name>
- <!-- <sample-name name="Two Column
Layout">fallback://lenya/modules/xhtml/samples/xhtml-2col.xml</sample-name> -->
- </creator>
+ src="fallback://lenya/modules/xhtml/resources/schemas/xhtml.rng"/>
+
+ <sample-name>fallback://lenya/modules/xhtml/samples/xhtml.xml</sample-name>
+ <!-- <sample-name name="Two Column
Layout">fallback://lenya/modules/xhtml/samples/xhtml-2col.xml</sample-name> -->
+
<link-attribute xpath="//*[namespace-uri() =
'http://www.w3.org/1999/xhtml']/@href"/>
<format name="xhtml" uri="cocoon://modules/xhtml/xhtml.xml"/>
<format name="webdavGET" uri="cocoon://modules/xhtml/davget.xml"/>
<format name="luceneIndex" uri="cocoon://modules/xhtml/lucene-index.xml"/>
</component-instance>
-
+
</xconf>
Modified: lenya/trunk/src/pubs/blog/config/cocoon-xconf/resourcetypes.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/config/cocoon-xconf/resourcetypes.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
--- lenya/trunk/src/pubs/blog/config/cocoon-xconf/resourcetypes.xconf (original)
+++ lenya/trunk/src/pubs/blog/config/cocoon-xconf/resourcetypes.xconf Fri May
19 05:43:17 2006
@@ -25,27 +25,21 @@
logger="lenya.resourcetypes.entry"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9";
src="fallback://lenya/resources/schemas/entry.rng"/>
- <creator src="org.apache.lenya.cms.authoring.NewBlogEntryCreator">
- <sample-name>fallback://lenya/resources/samples/entry.xml</sample-name>
- </creator>
+ <sample-name>fallback://lenya/resources/samples/entry.xml</sample-name>
</component-instance>
<component-instance name="sidebar"
logger="lenya.resourcetypes.sidebar"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9";
src="fallback://lenya/resources/schemas/sidebar.rng"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
- <sample-name>fallback://lenya/resources/samples/sidebar.xml</sample-name>
- </creator>
+ <sample-name>fallback://lenya/resources/samples/sidebar.xml</sample-name>
</component-instance>
<component-instance name="feed"
logger="lenya.resourcetypes.feed"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9";
src="fallback://lenya/resources/schemas/feed.rng"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
- <sample-name>fallback://lenya/resources/samples/feed.xml</sample-name>
- </creator>
+ <sample-name>fallback://lenya/resources/samples/feed.xml</sample-name>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
(original)
+++
lenya/trunk/src/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
Fri May 19 05:43:17 2006
@@ -19,7 +19,6 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
import org.apache.avalon.framework.service.ServiceSelector;
@@ -132,8 +131,7 @@
resourceType,
"xml",
getParameterAsString(DublinCore.ELEMENT_TITLE),
- true,
- new HashMap());
+ true);
transformXML(document);
} finally {
Modified:
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf?rev=407783&r1=407782&r2=407783&view=diff
==============================================================================
---
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
(original)
+++
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
Fri May 19 05:43:17 2006
@@ -23,9 +23,7 @@
logger="lenya.resourcetypes.homepage"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema
src="fallback://lenya/modules/homepage/resources/schemas/homepage.rng"
language="http://relaxng.org/ns/structure/0.9"/>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
- <sample-name>homepage.xml</sample-name>
- </creator>
+ <sample-name>homepage.xml</sample-name>
<link-attribute xpath="//*[namespace-uri() =
'http://www.w3.org/1999/xhtml']/@href"/>
<format name="xhtml" uri="cocoon://modules/homepage/xhtml.xml"/>
<format name="luceneIndex" uri="cocoon://modules/xhtml/lucene-index.xml"/>
|
