ivelin 02/04/19 06:19:27 Modified: src/scratchpad/src/org/apache/cocoon/transformation XMLFormTransformer.java src/scratchpad/webapp/mount/xmlform/stylesheets wizard2html.xsl src/scratchpad/webapp/mount/xmlform/wizard confirm.xml deployment.xml system.xml userIdentity.xml Log: minor cleanup of XMLFrom files. Revision Changes Path 1.2 +3 -2 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/XMLFormTransformer.java Index: XMLFormTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/XMLFormTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLFormTransformer.java 17 Apr 2002 17:59:15 -0000 1.1 +++ XMLFormTransformer.java 19 Apr 2002 13:19:27 -0000 1.2 @@ -152,7 +152,7 @@ public final static String NS = "http://xml.apache.org/cocoon/xmlform/2002"; - private final static String NS_PREFIX = "cform"; + private final static String NS_PREFIX = "xf"; public final static Attributes NOATTR = new AttributesImpl(); private final static String XMLNS_PREFIX = "xmlns"; @@ -445,7 +445,8 @@ // set the ref attribute AttributesImpl atts = new AttributesImpl( attributes ); - atts.addAttribute( NS, TAG_COMMON_ATTR_REF, NS_PREFIX + ":" + TAG_COMMON_ATTR_REF, "CDATA", violation.getPath()); + // atts.addAttribute( NS, TAG_COMMON_ATTR_REF, NS_PREFIX + ":" + TAG_COMMON_ATTR_REF, "CDATA", violation.getPath()); + atts.addAttribute( null, TAG_COMMON_ATTR_REF, TAG_COMMON_ATTR_REF, "CDATA", violation.getPath()); // now start the element super.startElement(uri, TAG_VIOLATION, NS_PREFIX + ":" + TAG_VIOLATION, atts); 1.2 +13 -4 xml-cocoon2/src/scratchpad/webapp/mount/xmlform/stylesheets/wizard2html.xsl Index: wizard2html.xsl =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/xmlform/stylesheets/wizard2html.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wizard2html.xsl 17 Apr 2002 17:59:16 -0000 1.1 +++ wizard2html.xsl 19 Apr 2002 13:19:27 -0000 1.2 @@ -68,16 +68,23 @@ errors. Please fix these errors and submit the form again. </p> <p> - <xsl:for-each select="error/xf:violation[string(@ref)='']"> - * - <xsl:value-of select="." /> - <br/> + <xsl:variable name="localViolations" select=".//xf:*[ child::xf:violation ]"/> + <xsl:for-each + select="error/xf:violation"> + <xsl:variable name="eref" select="./@ref"/> + <xsl:if test="count ($localViolations[ @ref=$eref ]) = 0"> + * + <xsl:copy-of select="." /> + <xsl:value-of select="." /> + <br/> + </xsl:if> </xsl:for-each> </p> <p/> </td> </tr> </xsl:if> + <xsl:for-each select="*[name() != 'xf:submit']"> <xsl:choose> <xsl:when test="name() = 'error'"/> @@ -133,4 +140,6 @@ </xsl:template> </xsl:stylesheet> + + 1.2 +97 -1 xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/confirm.xml Index: confirm.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/confirm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- confirm.xml 17 Apr 2002 18:37:23 -0000 1.1 +++ confirm.xml 19 Apr 2002 13:19:27 -0000 1.2 @@ -1 +1,97 @@ -<?xml version="1.0" ?> <!-- XMLForm instance document for the Cocoon Feedback Wizard. Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 --> <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> <xf:form id="form-feedback" view="confirm" action="wizard.html"> <xf:caption>Confirm Input</xf:caption> <!-- from page1 --> <xf:output ref="/firstName"> <xf:caption>First Name</xf:caption> </xf:output> <xf:output ref="/lastName"> <xf:caption>Last Name</xf:caption> </xf:output> <xf:output ref="/email"> <xf:caption>Email</xf:caption> </xf:output> <xf:output ref="/age"> <xf:caption>Age</xf:caption> <xf:violations class="error"/> </xf:output> <!-- from page2 --> <xf:output ref="/number"> <xf:caption>Number of installations</xf:caption> </xf:output> <xf:output ref="/liveUrl"> <xf:caption>Live URL</xf:caption> </xf:output> <xf:output ref="/publish"> <xf:caption>Publish URL</xf:caption> </xf:output> <!-- from page3 --> <xf:output ref="/system/os"> <xf:caption>OS</xf:caption> </xf:output> <xf:output ref="/system/processor"> <xf:caption>Processor</xf:caption> </xf:output> <xf:output ref="/system/@ram"> <xf:caption>RAM</xf:caption> </xf:output> <xf:output ref="/system/servletEngine"> <xf:caption>Servlet Engine</xf:caption> </xf:output> <xf:output ref="/system/javaVersion"> <xf:caption>Java Version</xf:caption> </xf:output> <!-- submit --> <xf:submit id="prev" class="button"> <xf:caption>Prev</xf:caption> </xf:submit> <xf:submit id="next" class="button"> <xf:caption>Finish</xf:caption> </xf:submit> </xf:form> <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> <xf:caption>Visits Count</xf:caption> </xf:output> </document> \ No newline at end of file +<?xml version="1.0" ?> + +<!-- + + XMLForm instance document for the Cocoon Feedback Wizard. + + Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 + Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 + +--> + +<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> + + + <xf:form id="form-feedback" view="confirm" action="wizard.html"> + + + <xf:caption>Confirm Input</xf:caption> + + + <!-- from page1 --> + + <xf:output ref="/firstName"> + <xf:caption>First Name</xf:caption> + </xf:output> + + <xf:output ref="/lastName"> + <xf:caption>Last Name</xf:caption> + </xf:output> + + <xf:output ref="/email"> + <xf:caption>Email</xf:caption> + </xf:output> + + <xf:output ref="/age"> + <xf:caption>Age</xf:caption> + <xf:violations class="error"/> + </xf:output> + + + <!-- from page2 --> + + <xf:output ref="/number"> + <xf:caption>Number of installations</xf:caption> + </xf:output> + + <xf:output ref="/liveUrl"> + <xf:caption>Live URL</xf:caption> + </xf:output> + + <xf:output ref="/publish"> + <xf:caption>Publish URL</xf:caption> + </xf:output> + + + <!-- from page3 --> + + + <xf:output ref="/system/os"> + <xf:caption>OS</xf:caption> + </xf:output> + + <xf:output ref="/system/processor"> + <xf:caption>Processor</xf:caption> + </xf:output> + + <xf:output ref="/system/@ram"> + <xf:caption>RAM</xf:caption> + </xf:output> + + <xf:output ref="/system/servletEngine"> + <xf:caption>Servlet Engine</xf:caption> + </xf:output> + + <xf:output ref="/system/javaVersion"> + <xf:caption>Java Version</xf:caption> + </xf:output> + + + <!-- submit --> + + <xf:submit id="prev" class="button"> + <xf:caption>Prev</xf:caption> + </xf:submit> + + <xf:submit id="next" class="button"> + <xf:caption>Finish</xf:caption> + </xf:submit> + + </xf:form> + + + <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> + <xf:caption>Visits Count</xf:caption> + </xf:output> + +</document> 1.2 +55 -1 xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/deployment.xml Index: deployment.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/deployment.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- deployment.xml 17 Apr 2002 18:37:23 -0000 1.1 +++ deployment.xml 19 Apr 2002 13:19:27 -0000 1.2 @@ -1 +1,55 @@ -<?xml version="1.0" ?> <!-- XMLForm instance document for the Cocoon Feedback Wizard. Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 --> <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> <xf:form id="form-feedback" view="deployment" action="wizard.html"> <xf:caption>Cocoon Deployment Information</xf:caption> <error> <xf:violations class="error"/> </error> <xf:textbox ref="/number"> <xf:caption>Number of deployments</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:textbox ref="/liveUrl"> <xf:caption>Live URL</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:selectBoolean ref="/publish"> <xf:caption>Publish</xf:caption> </xf:selectBoolean> <xf:submit id="prev" class="button"> <xf:caption>Prev</xf:caption> </xf:submit> <xf:submit id="next" class="button"> <xf:caption>Next</xf:caption> </xf:submit> </xf:form> <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> <xf:caption>Visits Count</xf:caption> </xf:output> </document> \ No newline at end of file +<?xml version="1.0" ?> + + + +<!-- + + XMLForm instance document for the Cocoon Feedback Wizard. + + Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 + Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 + +--> + +<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> + + <xf:form id="form-feedback" view="deployment" action="wizard.html"> + + <xf:caption>Cocoon Deployment Information</xf:caption> + + <error> + <xf:violations class="error"/> + </error> + + <xf:textbox ref="/number"> + <xf:caption>Number of deployments</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:textbox ref="/liveUrl"> + <xf:caption>Live URL</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:selectBoolean ref="/publish"> + <xf:caption>Publish</xf:caption> + </xf:selectBoolean> + + <xf:submit id="prev" class="button"> + <xf:caption>Prev</xf:caption> + </xf:submit> + + <xf:submit id="next" class="button"> + <xf:caption>Next</xf:caption> + </xf:submit> + + </xf:form> + + + <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> + <xf:caption>Visits Count</xf:caption> + </xf:output> + +</document> + + 1.2 +145 -1 xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/system.xml Index: system.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/system.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- system.xml 17 Apr 2002 18:37:23 -0000 1.1 +++ system.xml 19 Apr 2002 13:19:27 -0000 1.2 @@ -1 +1,145 @@ -<?xml version="1.0" ?> <!-- XMLForm instance document for the Cocoon Feedback Wizard. Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 --> <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> <xf:form id="form-feedback" view="system" action="wizard.html"> <xf:caption>System Information</xf:caption> <error> <xf:violations class="error"/> </error> <xf:selectOne ref="/system/os"> <xf:caption>OS</xf:caption> <xf:item id="unix"> <xf:caption>Unix/Linux</xf:caption> <xf:value>Unix</xf:value> </xf:item> <xf:item id="mac"> <xf:caption>Mac OS/X</xf:caption> <xf:value>Mac OS/X</xf:value> </xf:item> <xf:item id="win"> <xf:caption>Windows 95/98/NT/2000</xf:caption> <xf:value>Windows</xf:value> </xf:item> <xf:item id="other"> <xf:caption>Other</xf:caption> <xf:value>Other</xf:value> </xf:item> </xf:selectOne> <xf:selectOne ref="/system/processor"> <xf:caption>Processor</xf:caption> <xf:item> <xf:caption>AMD/Athlon</xf:caption> <xf:value>Athlon</xf:value> </xf:item> <xf:item> <xf:caption>AMD/Duron</xf:caption> <xf:value>Duron</xf:value> </xf:item> <xf:item> <xf:caption>Pentium Celeron</xf:caption> <xf:value>Celeron</xf:value> </xf:item> <xf:item> <xf:caption>Pentium III</xf:caption> <xf:value>p3</xf:value> </xf:item> <xf:item> <xf:caption>Pentium IV</xf:caption> <xf:value>p4</xf:value> </xf:item> <xf:item> <xf:caption>Other</xf:caption> <xf:value>other</xf:value> </xf:item> </xf:selectOne> <xf:textbox ref="/system/@ram"> <xf:caption>RAM</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:selectOne ref="/system/servletEngine"> <xf:caption>Servlet Engine</xf:caption> <xf:item> <xf:caption>Tomcat</xf:caption> <xf:value>Tomcat</xf:value> </xf:item> <xf:item> <xf:caption>Jetty</xf:caption> <xf:value>Jetty</xf:value> </xf:item> <xf:item> <xf:caption>Resin</xf:caption> <xf:value>Resin</xf:value> </xf:item> <xf:item> <xf:caption>Weblogic</xf:caption> <xf:value>weblogic</xf:value> </xf:item> <xf:item> <xf:caption>WebSphere</xf:caption> <xf:value>WebSphere</xf:value> </xf:item> <xf:item> <xf:caption>Other</xf:caption> <xf:value>other</xf:value> </xf:item> </xf:selectOne> <xf:selectOne ref="/system/javaVersion"> <xf:caption>Java Version</xf:caption> <xf:item> <xf:caption>1.1</xf:caption> <xf:value>1.1</xf:value> </xf:item> <xf:item> <xf:caption>1.2</xf:caption> <xf:value>1.2</xf:value> </xf:item> <xf:item> <xf:caption>1.3</xf:caption> <xf:value>1.3</xf:value> </xf:item> <xf:item> <xf:caption>1.4</xf:caption> <xf:value>1.4</xf:value> </xf:item> <xf:item> <xf:caption>Other</xf:caption> <xf:value>Other</xf:value> </xf:item> </xf:selectOne> <xf:submit id="prev" class="button"> <xf:caption>Prev</xf:caption> </xf:submit> <xf:submit id="next" class="button"> <xf:caption>Next</xf:caption> </xf:submit> </xf:form> <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> <xf:caption>Visits Count</xf:caption> </xf:output> </document> \ No newline at end of file +<?xml version="1.0" ?> + + + +<!-- + + XMLForm instance document for the Cocoon Feedback Wizard. + + Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 + Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 + +--> + +<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> + + + <xf:form id="form-feedback" view="system" action="wizard.html"> + + <xf:caption>System Information</xf:caption> + + <error> + <xf:violations class="error"/> + </error> + + <xf:selectOne ref="/system/os"> + <xf:caption>OS</xf:caption> + <xf:item id="unix"> + <xf:caption>Unix/Linux</xf:caption> + <xf:value>Unix</xf:value> + </xf:item> + <xf:item id="mac"> + <xf:caption>Mac OS/X</xf:caption> + <xf:value>Mac OS/X</xf:value> + </xf:item> + <xf:item id="win"> + <xf:caption>Windows 95/98/NT/2000</xf:caption> + <xf:value>Windows</xf:value> + </xf:item> + <xf:item id="other"> + <xf:caption>Other</xf:caption> + <xf:value>Other</xf:value> + </xf:item> + </xf:selectOne> + + <xf:selectOne ref="/system/processor"> + <xf:caption>Processor</xf:caption> + <xf:item> + <xf:caption>AMD/Athlon</xf:caption> + <xf:value>Athlon</xf:value> + </xf:item> + <xf:item> + <xf:caption>AMD/Duron</xf:caption> + <xf:value>Duron</xf:value> + </xf:item> + <xf:item> + <xf:caption>Pentium Celeron</xf:caption> + <xf:value>Celeron</xf:value> + </xf:item> + <xf:item> + <xf:caption>Pentium III</xf:caption> + <xf:value>p3</xf:value> + </xf:item> + <xf:item> + <xf:caption>Pentium IV</xf:caption> + <xf:value>p4</xf:value> + </xf:item> + <xf:item> + <xf:caption>Other</xf:caption> + <xf:value>other</xf:value> + </xf:item> + </xf:selectOne> + + <xf:textbox ref="/system/@ram"> + <xf:caption>RAM</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:selectOne ref="/system/servletEngine"> + <xf:caption>Servlet Engine</xf:caption> + <xf:item> + <xf:caption>Tomcat</xf:caption> + <xf:value>Tomcat</xf:value> + </xf:item> + <xf:item> + <xf:caption>Jetty</xf:caption> + <xf:value>Jetty</xf:value> + </xf:item> + <xf:item> + <xf:caption>Resin</xf:caption> + <xf:value>Resin</xf:value> + </xf:item> + <xf:item> + <xf:caption>Weblogic</xf:caption> + <xf:value>weblogic</xf:value> + </xf:item> + <xf:item> + <xf:caption>WebSphere</xf:caption> + <xf:value>WebSphere</xf:value> + </xf:item> + <xf:item> + <xf:caption>Other</xf:caption> + <xf:value>other</xf:value> + </xf:item> + </xf:selectOne> + + <xf:selectOne ref="/system/javaVersion"> + <xf:caption>Java Version</xf:caption> + <xf:item> + <xf:caption>1.1</xf:caption> + <xf:value>1.1</xf:value> + </xf:item> + <xf:item> + <xf:caption>1.2</xf:caption> + <xf:value>1.2</xf:value> + </xf:item> + <xf:item> + <xf:caption>1.3</xf:caption> + <xf:value>1.3</xf:value> + </xf:item> + <xf:item> + <xf:caption>1.4</xf:caption> + <xf:value>1.4</xf:value> + </xf:item> + <xf:item> + <xf:caption>Other</xf:caption> + <xf:value>Other</xf:value> + </xf:item> + </xf:selectOne> + + <xf:submit id="prev" class="button"> + <xf:caption>Prev</xf:caption> + </xf:submit> + + <xf:submit id="next" class="button"> + <xf:caption>Next</xf:caption> + </xf:submit> + + </xf:form> + + + <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> + <xf:caption>Visits Count</xf:caption> + </xf:output> + +</document> 1.2 +57 -1 xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/userIdentity.xml Index: userIdentity.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/xmlform/wizard/userIdentity.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- userIdentity.xml 17 Apr 2002 18:37:23 -0000 1.1 +++ userIdentity.xml 19 Apr 2002 13:19:27 -0000 1.2 @@ -1 +1,57 @@ -<?xml version="1.0" ?> <!-- XMLForm instance document for the Cocoon Feedback Wizard. Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 --> <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> <xf:form id="form-feedback" view="userIdentity" action="wizard.html"> <xf:caption>Personal Information</xf:caption> <error> <xf:violations class="error"/> </error> <xf:textbox ref="/firstName"> <xf:caption>First Name</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:textbox ref="/lastName"> <xf:caption>Last Name</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:textbox ref="/email"> <xf:caption>Email</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:textbox ref="/age"> <xf:caption>Age</xf:caption> <xf:violations class="error"/> </xf:textbox> <xf:submit id="next" class="button"> <xf:caption>Next</xf:caption> </xf:submit> </xf:form> <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> <xf:caption>Visits Count</xf:caption> </xf:output> </document> \ No newline at end of file +<?xml version="1.0" ?> + + +<!-- + + XMLForm instance document for the Cocoon Feedback Wizard. + + Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002 + Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002 + +--> + +<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> + + + <xf:form id="form-feedback" view="userIdentity" action="wizard.html"> + + <xf:caption>Personal Information</xf:caption> + + <error> + <xf:violations class="error"/> + </error> + + <xf:textbox ref="/firstName"> + <xf:caption>First Name</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:textbox ref="/lastName"> + <xf:caption>Last Name</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:textbox ref="/email"> + <xf:caption>Email</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:textbox ref="/age"> + <xf:caption>Age</xf:caption> + <xf:violations class="error"/> + </xf:textbox> + + <xf:submit id="next" class="button"> + <xf:caption>Next</xf:caption> + </xf:submit> + + </xf:form> + + + <xf:output ref="/count" id="show_count" form="form-feedback" class="info"> + <xf:caption>Visits Count</xf:caption> + </xf:output> + +</document> + +
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]