stephan 2003/05/19 03:30:26
Modified: . status.xml
src/blocks/xmlform/java/org/apache/cocoon/transformation
XMLFormTransformer.java
src/blocks/xmlform/samples/calc NumberA.xml NumberB.xml
Operator.xml Result.xml
src/blocks/xmlform/samples/flow confirm.xml deployment.xml
system.xml userIdentity.xml
src/blocks/xmlform/samples/stylesheets wizard2page.xsl
src/blocks/xmlform/samples/webservice error.xml ok.xml
usagefeedback.wsdl
src/blocks/xmlform/samples/wizard confirm.xml deployment.xml
system.xml userIdentity.xml
src/blocks/xmlform/test/org/apache/cocoon/components/xmlform
testform1.xml testform2.xml testresult1.xml
testresult2.xml
src/documentation/xdocs/howto howto-i18n-xmlform.xml
howto-xindice-xmlform.xml
src/documentation/xdocs/howto/xmlform-wizard
howto-xmlform-wizard-1.xml
src/documentation/xdocs/userdocs/generators
wsproxy-generator.xml
src/webapp/samples/webserviceproxy README.txt
src/webapp/samples/webserviceproxy/stylesheets
newWizard2html.xsl
src/webapp/stylesheets/system xmlform2html.xslt
Log:
Changed namespace to be coherent.
Revision Changes Path
1.36 +3 -0 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- status.xml 16 May 2003 14:39:02 -0000 1.35
+++ status.xml 19 May 2003 10:30:22 -0000 1.36
@@ -180,6 +180,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="SMS" type="update">
+ Changed namespace for XMLForm components to
'http://apache.org/cocoon/xmlform/1.0'.
+ </action>
<action dev="SMS" type="update" fixes-bug="19786" due-to="Torsten Knodt"
due-to-email="[EMAIL PROTECTED]">
Extended the ExtendedXLinkPipe to be more extensible. Prepared is html
and p3p.
</action>
1.6 +2 -2
cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/transformation/XMLFormTransformer.java
Index: XMLFormTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/transformation/XMLFormTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLFormTransformer.java 18 May 2003 16:58:27 -0000 1.5
+++ XMLFormTransformer.java 19 May 2003 10:30:24 -0000 1.6
@@ -89,7 +89,7 @@
// TODO: implements CacheableProcessingComponent {
- public final static String NS =
"http://xml.apache.org/cocoon/xmlform/2002";;
+ public final static String NS = "http://apache.org/cocoon/xmlform/1.0";;
private final static String NS_PREFIX = "xf";
public final static Attributes NOATTR = new AttributesImpl();
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/calc/NumberA.xml
Index: NumberA.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/calc/NumberA.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberA.xml 13 May 2003 12:06:12 -0000 1.1
+++ NumberA.xml 19 May 2003 10:30:24 -0000 1.2
@@ -7,7 +7,7 @@
<body>
<section>
<title>Number A</title>
- <xf:form id="calc"
xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+ <xf:form id="calc" xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<p>
Enter value of <strong>a</strong><br/>
<xf:textbox ref="numberA"/>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/calc/NumberB.xml
Index: NumberB.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/calc/NumberB.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberB.xml 13 May 2003 12:06:12 -0000 1.1
+++ NumberB.xml 19 May 2003 10:30:24 -0000 1.2
@@ -7,7 +7,7 @@
<body>
<section>
<title>Number B</title>
- <xf:form id="calc"
xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+ <xf:form id="calc" xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<p>
a = <xf:output ref="numberA"/>
</p>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/calc/Operator.xml
Index: Operator.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/calc/Operator.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Operator.xml 13 May 2003 12:06:12 -0000 1.1
+++ Operator.xml 19 May 2003 10:30:24 -0000 1.2
@@ -7,7 +7,7 @@
<body>
<section>
<title>Operator</title>
- <xf:form id="calc"
xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+ <xf:form id="calc" xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<p>
a = <xf:output ref="numberA"/>
</p>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/calc/Result.xml
Index: Result.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/calc/Result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Result.xml 13 May 2003 12:06:12 -0000 1.1
+++ Result.xml 19 May 2003 10:30:24 -0000 1.2
@@ -7,7 +7,7 @@
<body>
<section>
<title>Result</title>
- <xf:form id="calc"
xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+ <xf:form id="calc" xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<p>
a = <xf:output ref="numberA"/>
</p>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/flow/confirm.xml
Index: confirm.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/flow/confirm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.xml 25 Apr 2003 08:34:58 -0000 1.1
+++ confirm.xml 19 May 2003 10:30:24 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="confirm" action="flow">
<xf:caption>Confirm Input</xf:caption>
<!-- from page1 -->
1.2 +2 -2 cocoon-2.1/src/blocks/xmlform/samples/flow/deployment.xml
Index: deployment.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/flow/deployment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deployment.xml 25 Apr 2003 08:34:58 -0000 1.1
+++ deployment.xml 19 May 2003 10:30:24 -0000 1.2
@@ -3,12 +3,12 @@
XMLForm instance document for the Cocoon Feedback Wizard.
- author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="deployment" action="flow"
method="GET">
<xf:caption>Cocoon Deployment Information</xf:caption>
<error>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/flow/system.xml
Index: system.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/flow/system.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system.xml 25 Apr 2003 08:34:58 -0000 1.1
+++ system.xml 19 May 2003 10:30:24 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="system" action="flow" method="GET">
<xf:caption>System Information</xf:caption>
<error>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/samples/flow/userIdentity.xml
Index: userIdentity.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/flow/userIdentity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userIdentity.xml 25 Apr 2003 08:34:58 -0000 1.1
+++ userIdentity.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="userIdentity" action="flow" method="GET">
<xf:caption>Personal Information</xf:caption>
<error>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/samples/stylesheets/wizard2page.xsl
Index: wizard2page.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/stylesheets/wizard2page.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wizard2page.xsl 8 May 2003 09:44:54 -0000 1.1
+++ wizard2page.xsl 19 May 2003 10:30:25 -0000 1.2
@@ -12,7 +12,7 @@
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";
+ xmlns:xf="http://apache.org/cocoon/xmlform/1.0";
exclude-result-prefixes="xalan" >
<xsl:template match="document">
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/samples/webservice/error.xml
Index: error.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/webservice/error.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ error.xml 19 May 2003 10:30:25 -0000 1.2
@@ -4,7 +4,7 @@
Author: Ivelin Ivanov, [EMAIL PROTECTED], July 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<error>
<xf:violations form="form-feedback"/>
</error>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/webservice/ok.xml
Index: ok.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/webservice/ok.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ok.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ ok.xml 19 May 2003 10:30:25 -0000 1.2
@@ -4,6 +4,6 @@
Author: Ivelin Ivanov, [EMAIL PROTECTED], July 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<ok/>
</document>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/samples/webservice/usagefeedback.wsdl
Index: usagefeedback.wsdl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/webservice/usagefeedback.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usagefeedback.wsdl 25 Apr 2003 08:34:59 -0000 1.1
+++ usagefeedback.wsdl 19 May 2003 10:30:25 -0000 1.2
@@ -71,7 +71,7 @@
]]>
Otherwise the response will look similar to:
<![CDATA[
- <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+ <document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<error>
<xf:violation ref="/lastName">Last name should be at least 4
characters.</xf:violation>
</error>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/wizard/confirm.xml
Index: confirm.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/wizard/confirm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ confirm.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="confirm" action="wizard">
<xf:caption>Confirm Input</xf:caption>
<!-- from page1 -->
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/samples/wizard/deployment.xml
Index: deployment.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/wizard/deployment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deployment.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ deployment.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="deployment" action="wizard"
method="GET">
<xf:caption>Cocoon Deployment Information</xf:caption>
<error>
1.2 +1 -1 cocoon-2.1/src/blocks/xmlform/samples/wizard/system.xml
Index: system.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/wizard/system.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ system.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="system" action="wizard" method="GET">
<xf:caption>System Information</xf:caption>
<error>
1.2 +2 -2
cocoon-2.1/src/blocks/xmlform/samples/wizard/userIdentity.xml
Index: userIdentity.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/samples/wizard/userIdentity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userIdentity.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ userIdentity.xml 19 May 2003 10:30:25 -0000 1.2
@@ -4,11 +4,11 @@
XMLForm instance document for the Cocoon Feedback Wizard.
author: Ivelin Ivanov, [EMAIL PROTECTED], July 2002
- author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="form-feedback" view="userIdentity" action="wizard"
method="GET">
<xf:caption>Personal Information</xf:caption>
<error>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testform1.xml
Index: testform1.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testform1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testform1.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ testform1.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="testform" view="view1" action="wizard" method="GET">
<xf:caption>System Information</xf:caption>
<error>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testform2.xml
Index: testform2.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testform2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testform2.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ testform2.xml 19 May 2003 10:30:25 -0000 1.2
@@ -8,7 +8,7 @@
author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form id="testform" view="view2" action="wizard" method="GET">
<xf:caption>Cocoon Deployment Information</xf:caption>
<error>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testresult1.xml
Index: testresult1.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testresult1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testresult1.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ testresult1.xml 19 May 2003 10:30:25 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form action="wizard" id="testform" method="GET" view="view1">
<xf:caption>System Information</xf:caption>
<error/>
1.2 +1 -1
cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testresult2.xml
Index: testresult2.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/test/org/apache/cocoon/components/xmlform/testresult2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testresult2.xml 25 Apr 2003 08:34:59 -0000 1.1
+++ testresult2.xml 19 May 2003 10:30:25 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
+<document xmlns:xf="http://apache.org/cocoon/xmlform/1.0";>
<xf:form action="wizard" id="testform" method="GET" view="view2">
<xf:caption>Cocoon Deployment Information</xf:caption>
<error/>
1.3 +2 -2
cocoon-2.1/src/documentation/xdocs/howto/howto-i18n-xmlform.xml
Index: howto-i18n-xmlform.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/howto/howto-i18n-xmlform.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- howto-i18n-xmlform.xml 1 May 2003 14:38:00 -0000 1.2
+++ howto-i18n-xmlform.xml 19 May 2003 10:30:26 -0000 1.3
@@ -101,7 +101,7 @@
<source><