Author: nettings
Date: Sun Aug 12 12:35:00 2007
New Revision: 565125
URL: http://svn.apache.org/viewvc?view=rev&rev=565125
Log:
resource type configuration cleanup part 1:
<sample-name>foo://bar</sample-name>
becomes
<sample uri="foo://bar"/>
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf
lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf
lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf
lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf
lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf
lenya/trunk/src/modules/xhtml/samples/samples.xml
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
lenya/trunk/src/webapp/readme.xml
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java Sun Aug 12 12:35:00 2007
@@ -47,14 +47,14 @@
public class ResourceTypeImpl extends AbstractLogEnabled implements Configurable, ThreadSafe,
ResourceType, Serviceable {
- protected static final String SCHEMA_ELEMENT = "schema";
- protected static final String SRC_ATTRIBUTE = "src";
+ protected static final String ELEMENT_SCHEMA = "schema";
+ protected static final String ATTRIBUTE_SRC = "src";
protected static final String ELEMENT_REWRITE_ATTRIBUTE = "link-attribute";
protected static final String ATTRIBUTE_XPATH = "xpath";
protected static final String ELEMENT_SAMPLES = "samples";
- protected static final String SAMPLE_NAME = "sample-name";
- protected static final String SAMPLE_NAME_ATTRIBUTE = "name";
- protected static final String SAMPLE_MIME_TYPE_ATTRIBUTE = "mime-type";
+ protected static final String ELEMENT_SAMPLE = "sample";
+ protected static final String ATTRIBUTE_SAMPLE_NAME = "name";
+ protected static final String ATTRIBUTE_SAMPLE_MIME_TYPE = "mime-type";
protected static final String ELEMENT_FORMAT = "format";
protected static final String ATTRIBUTE_URI = "uri";
protected static final String ATTRIBUTE_NAME = "name";
@@ -80,10 +80,10 @@
try {
- Configuration schemaConf = config.getChild(SCHEMA_ELEMENT, false);
+ Configuration schemaConf = config.getChild(ELEMENT_SCHEMA, false);
if (schemaConf != null) {
- String uri = schemaConf.getAttribute(SRC_ATTRIBUTE);
+ String uri = schemaConf.getAttribute(ATTRIBUTE_SRC);
String language = schemaConf.getAttribute(ATTRIBUTE_LANGUAGE);
this.schema = new Schema(language, uri);
}
@@ -125,12 +125,12 @@
}
protected Map loadSamples(Configuration samplesParentConfig) throws ConfigurationException {
- Configuration[] samplesConf = samplesParentConfig.getChildren(SAMPLE_NAME);
+ Configuration[] samplesConf = samplesParentConfig.getChildren(ELEMENT_SAMPLE);
Map samples = new LinkedHashMap();
for (int i = 0; i < samplesConf.length; i++) {
- String name = samplesConf[i].getAttribute(SAMPLE_NAME_ATTRIBUTE, DEFAULT_SAMPLE_NAME);
- String mimeType = samplesConf[i].getAttribute(SAMPLE_MIME_TYPE_ATTRIBUTE);
- String uri = samplesConf[i].getValue();
+ String name = samplesConf[i].getAttribute(ATTRIBUTE_SAMPLE_NAME, DEFAULT_SAMPLE_NAME);
+ String mimeType = samplesConf[i].getAttribute(ATTRIBUTE_SAMPLE_MIME_TYPE);
+ String uri = samplesConf[i].getAttribute(ATTRIBUTE_URI);
samples.put(name, new Sample(name, mimeType, uri));
}
return samples;
Modified: lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf (original)
+++ lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf Sun Aug 12 12:35:00 2007
@@ -27,7 +27,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/entry.rng"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/blog/resources/samples/entry.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/blog/resources/samples/entry.xml"/>
</component-instance>
<component-instance name="sidebar"
@@ -35,7 +35,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/sidebar.rng"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/blog/samples/sidebar.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/blog/samples/sidebar.xml"/>
</component-instance>
<component-instance name="feed"
@@ -43,7 +43,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/feed.rng"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/blog/resources/samples/feed.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/blog/resources/samples/feed.xml"/>
</component-instance>
</xconf>
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?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf Sun Aug 12 12:35:00 2007
@@ -24,7 +24,10 @@
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"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/cforms/samples/cforms.xml</sample-name>
+ <sample
+ mime-type="application/xml"
+ uri="fallback://lenya/modules/cforms/samples/cforms.xml"
+ />
<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/collection/config/cocoon-xconf/resourcetype-collection.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf (original)
+++ lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf Sun Aug 12 12:35:00 2007
@@ -23,8 +23,8 @@
<component-instance name="collection"
logger="lenya.resourcetypes.collectoin"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
- <sample-name name="Manual" mime-type="application/xml">fallback://lenya/modules/collection/samples/collection.xml</sample-name>
- <sample-name name="Children" mime-type="application/xml">fallback://lenya/modules/collection/samples/children.xml</sample-name>
+ <sample name="Manual" mime-type="application/xml" uri="fallback://lenya/modules/collection/samples/collection.xml"/>
+ <sample name="Children" mime-type="application/xml" uri="fallback://lenya/modules/collection/samples/children.xml"/>
<format name="collection" uri="cocoon://modules/collection/collection.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?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- 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 Sun Aug 12 12:35:00 2007
@@ -25,7 +25,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"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/links/samples/links.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/links/samples/links.xml"/>
<format name="xhtml" uri="cocoon://modules/links/xhtml.xml"/>
<format name="luceneIndex" uri="cocoon://modules/xhtml/lucene-index"/>
<format name="webdavGET" uri="cocoon://modules/xhtml/davget.xml"/>
Modified: lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf (original)
+++ lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf Sun Aug 12 12:35:00 2007
@@ -27,7 +27,7 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="3600" />
- <sample-name mime-type="application/xml">fallback://lenya/modules/news/samples/news.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/news/samples/news.xml"/>
<format name="xhtml" uri="cocoon://modules/news/xhtml.xml"/>
<format name="include" uri="cocoon://modules/news/include.xml"/>
<format name="rss" uri="cocoon://modules/news/rss.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?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- 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 Sun Aug 12 12:35:00 2007
@@ -23,7 +23,10 @@
<component-instance name="opendocument"
logger="lenya.resourcetypes.opendocument"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
- <sample-name mime-type="application/vnd.oasis.opendocument.text">fallback://lenya/modules/opendocument/samples/helloworld.odt</sample-name>
+ <sample
+ mime-type="application/vnd.oasis.opendocument.text"
+ uri="fallback://lenya/modules/opendocument/samples/helloworld.odt"
+ />
<!-- 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/resource/config/cocoon-xconf/module.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf Sun Aug 12 12:35:00 2007
@@ -24,7 +24,7 @@
logger="lenya.resourcetypes.resource"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema src="fallback://lenya/modules/resource/resources/schemas/resource.rng" language="http://relaxng.org/ns/structure/0.9"/>
- <sample-name mime-type="application/xml">fallback://lenya/modules/resource/samples/resource.xml</sample-name>
+ <sample mime-type="application/xml" uri="fallback://lenya/modules/resource/samples/resource.xml"/>
<format name="xhtml" uri="cocoon://modules/resource/xhtml.xml"/>
<format name="downloadLink" uri="cocoon://modules/resource/downloadLink.xml"/>
<format name="icon" uri="cocoon://modules/resource/icon"/>
Modified: lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf (original)
+++ lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf Sun Aug 12 12:35:00 2007
@@ -25,9 +25,10 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/usecasedocument/resources/schemas/usecase.rng"/>
-
- <sample-name mime-type="application/xml">fallback://lenya/modules/usecasedocument/samples/usecase.xml</sample-name>
-
+ <sample
+ mime-type="application/xml"
+ uri="fallback://lenya/modules/usecasedocument/samples/usecase.xml"
+ />
<format name="xhtml" uri="cocoon://modules/usecasedocument/usecase.xml"/>
</component-instance>
Modified: lenya/trunk/src/modules/xhtml/samples/samples.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/samples/samples.xml?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/modules/xhtml/samples/samples.xml (original)
+++ lenya/trunk/src/modules/xhtml/samples/samples.xml Sun Aug 12 12:35:00 2007
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<samples>
- <sample-name mime-type="application/xhtml+xml">fallback://lenya/modules/xhtml/samples/xhtml.xml</sample-name>
- <sample-name name="Two Column Layout" mime-type="application/xhtml+xml">fallback://lenya/modules/xhtml/samples/xhtml-2col.xml</sample-name>
+ <sample
+ mime-type="application/xhtml+xml"
+ uri="fallback://lenya/modules/xhtml/samples/xhtml.xml"
+ />
+ <sample
+ name="Two Column Layout"
+ mime-type="application/xhtml+xml"
+ uri="fallback://lenya/modules/xhtml/samples/xhtml-2col.xml"
+ />
</samples>
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?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- 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 Sun Aug 12 12:35:00 2007
@@ -28,7 +28,10 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="0" />
- <sample-name mime-type="application/xhtml+xml">fallback://lenya/modules/homepage/samples/homepage.xml</sample-name>
+ <sample
+ mime-type="application/xhtml+xml"
+ uri="fallback://lenya/modules/homepage/samples/homepage.xml"
+ />
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@href"/>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@data"/>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@src"/>
Modified: lenya/trunk/src/webapp/readme.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/readme.xml?view=diff&rev=565125&r1=565124&r2=565125
==============================================================================
--- lenya/trunk/src/webapp/readme.xml (original)
+++ lenya/trunk/src/webapp/readme.xml Sun Aug 12 12:35:00 2007
@@ -28,12 +28,26 @@
<h2>Note to developers</h2>
<p>
Please use this new README to inform users
- about changes in the code or behaviour of Lenya. It is located under
+ about changes in the code or behaviour of Lenya, particularly those
+ that require custom code or publications to be modified. This file is located under
<code>src/webapp/readme.xml</code>. Its contents will be shown on the global
welcome page, and also on the introduction page of every publication.
</p>
<h2>Important notes for beta testers of Lenya 2.0</h2>
+
+ <h3>2007-08-12: Resource type configuration changed</h3>
+ <p>
+ The configuration syntax of resource types has been changed for consistency.
+ Please apply the following changes to your custom resource type configurations:
+ </p>
+ <ul>
+ <li>
+ <code><sample-name>fallback://foo>/sample-name></code>
+ becomes
+ <code><sample uri="fallback://foo"/></code>
+ </li>
+ </ul>
<h3>2007-07-27: PolicyAuthorizer removed</h3>
<p>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.