Author: thorsten
Date: Thu Oct 2 05:59:49 2008
New Revision: 701112
URL: http://svn.apache.org/viewvc?rev=701112&view=rev
Log:
Staying with the current namespace and do not raise the version
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.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.contract.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/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java?rev=701112&r1=701111&r2=701112&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
Thu Oct 2 05:59:49 2008
@@ -20,7 +20,7 @@
/*
* structurer captions
*/
- public static final String NS = "http://apache.org/forrest/templates/2.0";;
+ public static final String NS = "http://apache.org/forrest/templates/1.0";;
public static final String STRUCTURER_ELEMENT = "structurer";
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv?rev=701112&r1=701111&r2=701112&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
Thu Oct 2 05:59:49 2008
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/2.0";
+<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
<forrest:view type="html" hooksXpath="/html/body">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.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/convertor.contract.xml?rev=701112&r1=701111&r2=701112&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
Thu Oct 2 05:59:49 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="convertor">
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"; name="convertor">
<description>
<p> This is a test convertor to develop a component that allows user
to convert from the former version of the dispatcher to this one.</p>
@@ -24,7 +24,7 @@
</usage>
<forrest:template name="convertor" inputFormat="xsl">
<xsl:stylesheet version="1.0"
- xmlns:forrest="http://apache.org/forrest/templates/2.0";
+ xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="/">
<forrest:content>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.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/fo.contract.xml?rev=701112&r1=701111&r2=701112&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml
Thu Oct 2 05:59:49 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="fo">
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"; name="fo">
<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";
xmlns:fo="http://www.w3.org/1999/XSL/Format";>
<forrest:part>
<fo:bookmark>
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=701112&r1=701111&r2=701112&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
Thu Oct 2 05:59:49 2008
@@ -13,7 +13,7 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<structurer xmlns="http://apache.org/forrest/templates/2.0";>
+<structurer xmlns="http://apache.org/forrest/templates/1.0";>
<structure type="html" hooksXpath="/html/body">
<hook id="example">
<contract name="master">
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.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/master.contract.xml?rev=701112&r1=701111&r2=701112&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml
Thu Oct 2 05:59:49 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="master">
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"; name="master">
<description>
<p> This is just a master contract, it will output something but
*nothing* in special. It should just serve to explain a wee bit
@@ -31,7 +31,7 @@
<xsl:param name="injectPointHead" select="'/html/head'" />
<xsl:param name="injectPointBody"
select="'/html/body/forrest:hook/forrest:hook'" />
<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 xpath="{$injectPointHead}">
<meta
content=" Content going to a fixed location defined by the
contract
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=701112&r1=701111&r2=701112&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
Thu Oct 2 05:59:49 2008
@@ -13,7 +13,7 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<structurer xmlns="http://apache.org/forrest/templates/2.0";>
+<structurer xmlns="http://apache.org/forrest/templates/1.0";>
<structure type="html" hooksXpath="/html/body">
<hook id="example">
<hook id="level2">
