svn commit: r565133 - in /lenya/trunk/src: impl/java/org/apache/lenya/cms/publication/ modules/blog/config/cocoon-xconf/ modules/cforms/config/cocoon-xconf/ modules/collection/config/cocoon-xconf/ modules/links/config/cocoon-xconf/ modules/news/config/...

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: nettings
Date: Sun Aug 12 13:18:33 2007
New Revision: 565133

URL: http://svn.apache.org/viewvc?view=rev&rev=565133
Log:
resource type configuration cleanup part 2:
<schema src="foo://bar.rng"
language="http://relaxng.org/ns/structure/0.9"/>
becomes
<schema uri="foo://bar.rng"
namespace="http://relaxng.org/ns/structure/0.9"/>


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/resource/config/cocoon-xconf/module.xconf
    lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf
    lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
    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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -47,18 +47,16 @@
 public class ResourceTypeImpl extends AbstractLogEnabled implements Configurable, ThreadSafe,
         ResourceType, Serviceable {
 
+    protected static final String ATTRIBUTE_URI = "uri";
+    protected static final String ATTRIBUTE_NAME = "name";
     protected static final String ELEMENT_SCHEMA = "schema";
-    protected static final String ATTRIBUTE_SRC = "src";
+    protected static final String ATTRIBUTE_NAMESPACE = "namespace";
     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 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";
-    protected static final String ATTRIBUTE_LANGUAGE = "language";
     protected static final String EXPIRES_ELEMENT = "expires";
     protected static final String SECONDS_ATTRIBUTE = "seconds";
 
@@ -83,8 +81,8 @@
             Configuration schemaConf = config.getChild(ELEMENT_SCHEMA, false);
 
             if (schemaConf != null) {
-                String uri = schemaConf.getAttribute(ATTRIBUTE_SRC);
-                String language = schemaConf.getAttribute(ATTRIBUTE_LANGUAGE);
+                String uri = schemaConf.getAttribute(ATTRIBUTE_URI);
+                String language = schemaConf.getAttribute(ATTRIBUTE_NAMESPACE);
                 this.schema = new Schema(language, uri);
             }
 
@@ -128,7 +126,7 @@
         Configuration[] samplesConf = samplesParentConfig.getChildren(ELEMENT_SAMPLE);
         Map samples = new LinkedHashMap();
         for (int i = 0; i < samplesConf.length; i++) {
-            String name = samplesConf[i].getAttribute(ATTRIBUTE_SAMPLE_NAME, DEFAULT_SAMPLE_NAME);
+            String name = samplesConf[i].getAttribute(ATTRIBUTE_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));

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=565133&r1=565132&r2=565133
==============================================================================
--- lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf (original)
+++ lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf Sun Aug 12 13:18:33 2007
@@ -25,25 +25,40 @@
   <component-instance name="entry"
                       logger="lenya.resourcetypes.entry"
                       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 mime-type="application/xml" uri="fallback://lenya/modules/blog/resources/samples/entry.xml"/>
+    <schema 
+       namespace="http://relaxng.org/ns/structure/0.9"
+       uri="fallback://lenya/modules/blog/resources/schemas/entry.rng"
+    />
+    <sample 
+       mime-type="application/xml" 
+       uri="fallback://lenya/modules/blog/resources/samples/entry.xml"
+    />
   </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/modules/blog/resources/schemas/sidebar.rng"/>
-    <sample mime-type="application/xml" uri="fallback://lenya/modules/blog/samples/sidebar.xml"/>
+    <schema 
+       namespace="http://relaxng.org/ns/structure/0.9"
+       uri="fallback://lenya/modules/blog/resources/schemas/sidebar.rng"
+    />
+    <sample 
+       mime-type="application/xml" 
+       uri="fallback://lenya/modules/blog/samples/sidebar.xml"
+    />
   </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/modules/blog/resources/schemas/feed.rng"/>
-    <sample mime-type="application/xml" uri="fallback://lenya/modules/blog/resources/samples/feed.xml"/>
+    <schema 
+       namespace="http://relaxng.org/ns/structure/0.9"
+       uri="fallback://lenya/modules/blog/resources/schemas/feed.rng"
+    />
+    <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=565133&r1=565132&r2=565133
==============================================================================
--- lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf Sun Aug 12 13:18:33 2007
@@ -23,7 +23,10 @@
   <component-instance name="cforms"
                       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"/>
+    <schema 
+      uri="fallback://lenya/modules/cforms/schemas/cforms.rng" 
+      namespace="http://relaxng.org/ns/structure/0.9"
+    />
     <sample 
       mime-type="application/xml"
       uri="fallback://lenya/modules/cforms/samples/cforms.xml"

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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -21,8 +21,14 @@
 <xconf xpath="/cocoon/resource-types" unless="/cocoon/resource-types/component-instance[@name = 'collection']">
 
   <component-instance name="collection"
-                      logger="lenya.resourcetypes.collectoin"
+                      logger="lenya.resourcetypes.collection"
                       class="org.apache.lenya.cms.publication.ResourceTypeImpl">
+    <!-- FIXME: shouldn't this resource type provide validation? 
+    <schema
+      namespace="http://relaxng.org/ns/structure/0.9"
+      uri=""
+    />
+    -->
     <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"/>

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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -23,9 +23,14 @@
   <component-instance name="links"
                       logger="lenya.resourcetypes.links"
                       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 mime-type="application/xml" uri="fallback://lenya/modules/links/samples/links.xml"/>
+    <schema 
+      namespace="http://relaxng.org/ns/structure/0.9"
+      uri="fallback://lenya/modules/links/resources/schema/links.rng"
+    />
+    <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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -27,7 +27,10 @@
     <!-- Default time in seconds until the resource-type has expired -->  
     <expires seconds="3600" />
     
-    <sample mime-type="application/xml" uri="fallback://lenya/modules/news/samples/news.xml"/>
+    <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/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=565133&r1=565132&r2=565133
==============================================================================
--- lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf Sun Aug 12 13:18:33 2007
@@ -23,8 +23,14 @@
   <component-instance name="resource"
                       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 mime-type="application/xml" uri="fallback://lenya/modules/resource/samples/resource.xml"/>
+    <schema 
+       uri="fallback://lenya/modules/resource/resources/schemas/resource.rng" 
+       namespace="http://relaxng.org/ns/structure/0.9"
+    />
+    <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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -23,8 +23,10 @@
   <component-instance name="usecase"
     logger="lenya.resourcetypes.usecase"
     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"/>
+    <schema 
+      namespace="http://relaxng.org/ns/structure/0.9"
+      uri="fallback://lenya/modules/usecasedocument/resources/schemas/usecase.rng"
+    />
     <sample 
       mime-type="application/xml"
       uri="fallback://lenya/modules/usecasedocument/samples/usecase.xml"

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?view=diff&rev=565133&r1=565132&r2=565133
==============================================================================
--- 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 Sun Aug 12 13:18:33 2007
@@ -23,8 +23,9 @@
   <component-instance name="xhtml"
     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"/>
+    <schema 
+      namespace="http://relaxng.org/ns/structure/0.9"
+      uri="fallback://lenya/modules/xhtml/resources/schemas/xhtml.rng"/>
     
     <!-- Default time in seconds until the resource-type has expired -->  
     <expires seconds="3600" />

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=565133&r1=565132&r2=565133
==============================================================================
--- 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 13:18:33 2007
@@ -23,7 +23,10 @@
   <component-instance name="homepage"
                       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"/>
+    <schema 
+       uri="fallback://lenya/modules/homepage/resources/schemas/homepage.rng"
+       namespace="http://relaxng.org/ns/structure/0.9"
+    />
 
     <!-- Default time in seconds until the resource-type has expired -->  
     <expires seconds="0" />

Modified: lenya/trunk/src/webapp/readme.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/readme.xml?view=diff&rev=565133&r1=565132&r2=565133
==============================================================================
--- lenya/trunk/src/webapp/readme.xml (original)
+++ lenya/trunk/src/webapp/readme.xml Sun Aug 12 13:18:33 2007
@@ -43,11 +43,21 @@
     </p>
     <ul>
       <li>
-        <code>&lt;sample-name&gt;fallback://foo&gt;/sample-name&gt;</code>
+        <code>&lt;sample-name mime-type="baz" name="bar"&gt;fallback://foo&lt;/sample-name&gt;</code>
         becomes
-        <code>&lt;sample uri="fallback://foo"/&gt;</code>
+        <code>&lt;sample mime-type="baz" name="bar" uri="fallback://foo"/&gt;</code>
+      </li>
+      <li>
+        <code>&lt;schema src="fallback://foo.rng" language="http://relaxng.org/ns/structure/0.9"/&gt;</code>
+        becomes
+        <code>&lt;schema uri="fallback://foo.rng" namespace="http://relaxng.org/ns/structure/0.9"/&gt;</code>
       </li>
     </ul>
+    <p>
+      After that, you need to delete
+    <code>build/lenya/webapp/WEB-INF/cocoon.xconf</code> and rebuild Lenya
+      to deploy the changes.
+    </p>
     
     <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.