You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/04/01 15:58:31 UTC
svn commit: r760895 - in /lenya/contributions/2_0_X/modules/atom:
jx/workspace.jx resources/ resources/metadata.rng sitemap.xmap
test/canoo/test.xml
Author: andreas
Date: Wed Apr 1 13:58:29 2009
New Revision: 760895
URL: http://svn.apache.org/viewvc?rev=760895&view=rev
Log:
Updating atom editing meta data schema handling.
Added:
lenya/contributions/2_0_X/modules/atom/resources/
lenya/contributions/2_0_X/modules/atom/resources/metadata.rng
Modified:
lenya/contributions/2_0_X/modules/atom/jx/workspace.jx
lenya/contributions/2_0_X/modules/atom/sitemap.xmap
lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml
Modified: lenya/contributions/2_0_X/modules/atom/jx/workspace.jx
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/jx/workspace.jx?rev=760895&r1=760894&r2=760895&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/jx/workspace.jx (original)
+++ lenya/contributions/2_0_X/modules/atom/jx/workspace.jx Wed Apr 1 13:58:29 2009
@@ -26,7 +26,7 @@
<accept>image/gif</accept>
</collection>
</workspace>
- <firedocs:metadata xmlns:firedocs="www.firedocs.org/metadata/1.0">
- <firedocs:schema type="relaxNG" href="/modules/firedocs/metadata.rng"/>
- </firedocs:metadata>
+ <edit:metadata xmlns:edit="http://apache.org/lenya/editing">
+ <edit:schema type="relaxNG" href="/modules/atom/metadata.rng"/>
+ </edit:metadata>
</service>
Added: lenya/contributions/2_0_X/modules/atom/resources/metadata.rng
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/resources/metadata.rng?rev=760895&view=auto
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/resources/metadata.rng (added)
+++ lenya/contributions/2_0_X/modules/atom/resources/metadata.rng Wed Apr 1 13:58:29 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns:dc="http://purl.org/dc/elements/1.1/"
+ ns="http://apache.org/lenya/editing"
+ xmlns:ann="www.firedocs.org/relaxNG/annotation/1.0"
+ xmlns="http://relaxng.org/ns/structure/1.0">
+ <start>
+ <element name="metadata">
+ <element name="dc:title" ann:label="Title">
+ <data type="string" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <param name="minLength">1</param>
+ </data>
+ </element>
+ <optional>
+ <element name="dc:description">
+ <text/>
+ </element>
+ </optional>
+ <element name="dc:rights">
+ <text/>
+ </element>
+ </element>
+ </start>
+</grammar>
Modified: lenya/contributions/2_0_X/modules/atom/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/sitemap.xmap?rev=760895&r1=760894&r2=760895&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/sitemap.xmap (original)
+++ lenya/contributions/2_0_X/modules/atom/sitemap.xmap Wed Apr 1 13:58:29 2009
@@ -96,6 +96,10 @@
<map:serialize type="xml"/>
</map:match>
+ <map:match pattern="**.rng">
+ <map:read mime-type="application/xml" src="fallback://lenya/modules/atom/resources/{1}.rng"/>
+ </map:match>
+
</map:pipeline>
</map:pipelines>
Modified: lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml?rev=760895&r1=760894&r2=760895&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml (original)
+++ lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml Wed Apr 1 13:58:29 2009
@@ -72,6 +72,7 @@
<property name="contentMimeType" value="application/xhtml+xml"/>
<property name="schemaUri" value="/${pubId}/modules/xhtml/schemas/xhtml.rng"/>
+ <property name="metadataSchemaUri" value="/modules/atom/metadata.rng"/>
<target name="wt.testInWork" depends="
atom.setup,
@@ -235,6 +236,15 @@
<storeXPath property="topLevelDocsUrl" xpath="/app:service/app:workspace[atom:title = 'Documents']/app:collection/@href"/>
<storeXPath property="globalAssetsUrl" xpath="/app:service/app:workspace[atom:title = 'Assets']/app:collection/@href"/>
+
+ <!-- ====================================================================== -->
+ <!-- verify: meta data -->
+ <!-- ====================================================================== -->
+
+ <verifyXPath xpath="/app:service/edit:metadata/edit:schema[@href = '${metadataSchemaUri}']"/>
+ <invoke url="${metadataSchemaUri}"/>
+ <verifyResponseCode code="200"/>
+ <verifyXPath xpath="/relaxng:grammar"/>
<!-- ====================================================================== -->
<!-- verify: document contained in top-level documents -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org