forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r702464 - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher: m2.contract.xml master.advanced.structurer.xml master.structurer.xml
Date Tue, 07 Oct 2008 12:55:32 GMT
Author: thorsten
Date: Tue Oct  7 05:55:31 2008
New Revision: 702464

URL: http://svn.apache.org/viewvc?rev=702464&view=rev
Log:
FOR-1118 Using prefixes for the elemen and the old ns

Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml?rev=702464&r1=702463&r2=702464&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
Tue Oct  7 05:55:31 2008
@@ -14,7 +14,7 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/2.0" name="m2">
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="m2">
   <description>
     <p> This is just a test contract for using in junit.</p>
   </description>
@@ -27,7 +27,7 @@
       <xsl:param name="test-inline" select="'No parameter has been passed'" />
       <xsl:param name="test-inline-xml" select="'No xml parameter has been passed'" />
       <xsl:template match="/">
-        <forrest:content xmlns:forrest="http://apache.org/forrest/templates/2.0">
+        <forrest:content xmlns:forrest="http://apache.org/forrest/templates/1.0">
           <forrest:part>
             Another test! $test-inline:
             <xsl:value-of select="$test-inline" />

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml?rev=702464&r1=702463&r2=702464&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
Tue Oct  7 05:55:31 2008
@@ -13,33 +13,33 @@
     License for the specific language governing permissions and
     limitations under the License.
   -->
-<structurer xmlns="http://apache.org/forrest/templates/1.0">
-  <structure type="html" hooksXpath="/html/body">
-    <hook id="example">
-      <contract name="master">
-        <property name="test-inline-xml">
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <forrest:structure type="html" hooksXpath="/html/body">
+    <forrest:hook id="example">
+      <forrest:contract name="master">
+        <forrest:property name="test-inline-xml">
           <css url="common.css" />
 <!--<nupp/>-->
-        </property>
-        <property name="test-inline" value="position:hook/contract" />
-      </contract>
-      <hook id="level2">
-        <contract name="master">
-          <property name="test-inline" value="position:hook/hook/contract" />
-          <property name="injectPointBody" value="/html/body/forrest:hook/forrest:hook[@id='level2'
and @ie='level2']/hook" /> 
-        </contract>
-      </hook>
-    </hook>
-    <hook id="second">
-      <contract name="m2" dataURI="">
-        <property name="test-inline" value="xxx" />
-      </contract>
-    </hook>
-  </structure>
-  <structure type="xml" hooksXpath="/">
-    <contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv" />
-  </structure>
-  <structure type="fo" hooksXpath="/">
-    <contract name="fo" />
-  </structure>
-</structurer>
\ No newline at end of file
+        </forrest:property>
+        <forrest:property name="test-inline" value="position:hook/forrest:contract" />
+      </forrest:contract>
+      <forrest:hook id="level2">
+        <forrest:contract name="master">
+          <forrest:property name="test-inline" value="position:hook/hook/forrest:contract"
/>
+          <forrest:property name="injectPointBody" value="/html/body/forrest:hook/forrest:hook[@id='level2'
and @ie='level2']/hook" /> 
+        </forrest:contract>
+      </forrest:hook>
+    </forrest:hook>
+    <forrest:hook id="second">
+      <forrest:contract name="m2" dataURI="">
+        <forrest:property name="test-inline" value="xxx" />
+      </forrest:contract>
+    </forrest:hook>
+  </forrest:structure>
+  <forrest:structure type="xml" hooksXpath="/">
+    <forrest:contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv"
/>
+  </forrest:structure>
+  <forrest:structure type="fo" hooksXpath="/">
+    <forrest:contract name="fo" />
+  </forrest:structure>
+</forrest:structurer>
\ No newline at end of file

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml?rev=702464&r1=702463&r2=702464&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
Tue Oct  7 05:55:31 2008
@@ -13,21 +13,21 @@
     License for the specific language governing permissions and
     limitations under the License.
   -->
-<structurer xmlns="http://apache.org/forrest/templates/1.0">
-  <structure type="html" hooksXpath="/html/body">
-    <hook id="example">
-      <hook id="level2">
-        <contract name="m2" dataURI="">
-          <property name="test-inline" value="xxx" />
-          <property name="test-inline-xml">
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  <forrest:structure type="html" hooksXpath="/html/body">
+    <forrest:hook id="example">
+      <forrest:hook id="level2">
+        <forrest:contract name="m2" dataURI="">
+          <forrest:property name="test-inline" value="xxx" />
+          <forrest:property name="test-inline-xml">
             <css url="common.css" />
 <!--<nupp/>-->
-          </property>
-        </contract>
-      </hook>
-    </hook>
-  </structure>
-  <structure type="xml" hooksXpath="/">
-    <contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv" />
-  </structure>
-</structurer>
\ No newline at end of file
+          </forrest:property>
+        </forrest:contract>
+      </forrest:hook>
+    </forrest:hook>
+  </forrest:structure>
+  <forrest:structure type="xml" hooksXpath="/">
+    <forrest:contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv"
/>
+  </forrest:structure>
+</forrest:structurer>
\ No newline at end of file



Mime
View raw message