You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ti...@apache.org on 2005/02/03 17:07:19 UTC
svn commit: r151173 - in cocoon/branches/BRANCH_2_1_X/src/blocks/forms:
java/org/apache/cocoon/forms/binding/
java/org/apache/cocoon/forms/flow/javascript/
java/org/apache/cocoon/forms/formmodel/ java/org/apache/cocoon/forms/util/
samples/ samples/flow/ samples/forms/ samples/resources/ samples/v2/
test/org/apache/cocoon/forms/datatype/
Author: tim
Date: Thu Feb 3 08:07:11 2005
New Revision: 151173
URL: http://svn.apache.org/viewcvs?view=rev&rev=151173
Log:
Minor merges with trunk and Id fixes.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/bindings.js
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_binding.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_binding.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_bind_xml.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_binding.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_model.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_binding.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_model.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-field-styling.xsl
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-samples-styling.xsl
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/carselector_form.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/form1.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/Sex.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java Thu Feb 3 08:07:11 2005
@@ -31,8 +31,8 @@
* <pre><code>
* <fb:insert-bean addmethod="..method-to-add.."/>
* </code></pre>
- *
- * @version CVS $Id$
+ *
+ * @version $Id$
*/
public class InsertBeanJXPathBindingBuilder extends JXPathBindingBuilderBase {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java Thu Feb 3 08:07:11 2005
@@ -31,7 +31,7 @@
* Jakarta Commons <a href="http://jakarta.apache.org/commons/jxpath/index.html">
* JXPath package</a>.
*
- * @version CVS $Id$
+ * @version $Id$
*/
public abstract class JXPathBindingBase implements Binding, LogEnabled {
@@ -163,8 +163,6 @@
jxpc.setLenient(inheritedLeniency);
}
-
-
/**
* Hooks up with the more generic Binding of any objectModel by wrapping
* it up in a JXPathContext object and then transfering control over to
@@ -240,8 +238,7 @@
}
}
}
-
-
+
private JXPathContext makeJXPathContext(Object objModel) {
JXPathContext jxpc;
if (!(objModel instanceof JXPathContext)) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingManager.java Thu Feb 3 08:07:11 2005
@@ -97,7 +97,7 @@
InputSource is = new InputSource(source.getInputStream());
is.setSystemId(source.getURI());
- Document doc = DomHelper.parse(is, manager);
+ Document doc = DomHelper.parse(is, this.manager);
Element rootElm = doc.getDocumentElement();
if (BindingManager.NAMESPACE.equals(rootElm.getNamespaceURI())) {
binding = getBuilderAssistant()
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java Thu Feb 3 08:07:11 2005
@@ -48,6 +48,9 @@
this.classBinding = null;
}
+ /**
+ * Recursively resolves references.
+ */
private void resolve() throws BindingException {
classBinding = getClass(widgetId);
if (classBinding == null) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java Thu Feb 3 08:07:11 2005
@@ -29,7 +29,7 @@
* that contains other widgets.</li>
* </ol>
*
- * @version CVS $Id$
+ * @version $Id$
*/
public class StructJXPathBinding extends ContextJXPathBinding {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js Thu Feb 3 08:07:11 2005
@@ -18,7 +18,7 @@
* Implementation of the Cocoon Forms/FlowScript integration.
*
* @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
*/
// Revisit this class, so it gives access to more than the value.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java Thu Feb 3 08:07:11 2005
@@ -34,7 +34,7 @@
*
* @author Bruno Dumon
* @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
*/
public class Form extends AbstractContainerWidget {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java Thu Feb 3 08:07:11 2005
@@ -61,7 +61,7 @@
* able to provide information about the location of elements in their source
* XML file. See the {@link #getLocation(Element)} method.
*
- * @version CVS $Id$
+ * @version $Id$
*/
public class DomHelper {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java Thu Feb 3 08:07:11 2005
@@ -306,7 +306,7 @@
data(datatype.convertToString(widget.getValue(), this.locale));
} else if (widget instanceof BooleanField) {
// FIXME: BooleanField should implement DataWidget, which
- // would make this case unnecesary
+ // would make this case unnecessary
if (widget.getValue() != null) {
data(BooleanUtils.toStringTrueFalse((Boolean)widget.getValue()));
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/bindings.js
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/bindings.js?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/bindings.js (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/bindings.js Thu Feb 3 08:07:11 2005
@@ -66,7 +66,7 @@
// all back-end models are bound to essentially the same form, using the same binding!
var form = createFormForSample(sampleCode);
- // the beack-end model itself however depends on sample and type.
+ // the back-end model itself however depends on sample and type.
var bean = createBeanForSample(backendType, sampleCode);
// loads the backend-bean into the form
@@ -78,7 +78,7 @@
// saves the form into the backend-bean
form.save(bean);
var bizData = new Object();
- //hack the XML content to a string for display
+ // hack the XML content to a string for display
if (backendType.equals("XML")) {
bean = {xml: serializeNode(bean)};
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js Thu Feb 3 08:07:11 2005
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
-// CVS $Id$
+/*
+* @version $Id$
+*/
+
+cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
function form_model_gui(form) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_binding.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_binding.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_binding.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fb:context xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
path="config/datasource">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_binding.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_binding.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_binding.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fb:context xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
path=".">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_bind_xml.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_bind_xml.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_bind_xml.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_bind_xml.xml Thu Feb 3 08:07:11 2005
@@ -107,7 +107,7 @@
</fb:on-bind>
<fb:on-delete-row>
- <!-- chose on of these to test -->
+ <!-- choose one of these to test -->
<!--
<fb:set-attribute name="row-state" value="deleted" />
-->
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_binding.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_binding.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_binding.xml Thu Feb 3 08:07:11 2005
@@ -16,9 +16,9 @@
-->
<!--
-Binding for example CForms form model GUI.
+ Binding for example CForms form model GUI.
-@version CVS $Id$
+ @version $Id$
-->
<fb:context
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_model.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_model.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_model.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_model.xml Thu Feb 3 08:07:11 2005
@@ -14,14 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!--
+ @version $Id$
+-->
+
<fd:form
xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
<fd:widgets>
-
- <!--
- CVS $Id$
- -->
<!--
TODO:
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form_model_gui_template.xml Thu Feb 3 08:07:11 2005
@@ -14,13 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!--
+ @version $Id$
+-->
+
<page
xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
-
- <!--
- CVS $Id$
- -->
<!--
TODO: Add features to "widgets-class" (e.g. move-up, move-down, add-before, add-after).
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_binding.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_binding.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_binding.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fb:context xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_model.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_model.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_model.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/multipage_model.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/tasktree.xml Thu Feb 3 08:07:11 2005
@@ -15,11 +15,11 @@
limitations under the License.
-->
-<!--+
- | A form for a work breakdown in a tree of tasks.
- |
- | CVS $Id$
- +-->
+<!--
+ A form for a work breakdown in a tree of tasks.
+
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
@@ -37,7 +37,7 @@
</fd:repeater>
<fd:repeater-action id="addsub" repeater="tasks" action-command="add-row">
<fd:label>Add subtasks</fd:label>
- <fd:hint>Creates a task subtree</fd:hint>
+ <fd:hint>Creates a task subtree</fd:hint>
</fd:repeater-action>
</fd:widgets>
</fd:class>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-field-styling.xsl?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-field-styling.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-field-styling.xsl Thu Feb 3 08:07:11 2005
@@ -14,15 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!--
+ This stylesheet is designed to be included by 'forms-samples-styling.xsl'.
+
+ @version $Id$
+-->
+
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
exclude-result-prefixes="fi">
- <!--+
- | This stylesheet is designed to be included by 'forms-samples-styling.xsl'.
- | Version CVS $Id$
- +-->
-
<!-- Location of the resources directory, where JS libs and icons are stored -->
<xsl:param name="resources-uri">resources</xsl:param>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-samples-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-samples-styling.xsl?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-samples-styling.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/resources/forms-samples-styling.xsl Thu Feb 3 08:07:11 2005
@@ -29,7 +29,7 @@
<head>
<xsl:apply-templates/>
<xsl:apply-templates select="." mode="forms-page"/>
- <xsl:apply-templates select="." mode="forms-field"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
</head>
</xsl:template>
@@ -40,7 +40,7 @@
+-->
<xsl:apply-templates select="." mode="forms-page"/>
<xsl:apply-templates select="." mode="forms-field"/>
- <xsl:apply-templates/>
+ <xsl:apply-templates/>
</body>
</xsl:template>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/carselector_form.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/carselector_form.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/carselector_form.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/carselector_form.xml Thu Feb 3 08:07:11 2005
@@ -14,8 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id$-->
-<!-- form used to illustrate programmatic changing of listbox content. -->
+
+<!--
+ Form used to illustrate programmatic changing of listbox content.
+
+ @version $Id$
+-->
+
<fd:form
xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/form1.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/form1.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/form1.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/v2/form1.xml Thu Feb 3 08:07:11 2005
@@ -15,9 +15,9 @@
limitations under the License.
-->
-<!--+
- | CVS $Id$
- +-->
+<!--
+ @version $Id$
+-->
<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml Thu Feb 3 08:07:11 2005
@@ -14,7 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id$-->
+<!--
+ @version $Id$
+-->
<samples name="CForms Block Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
<group name="Back">
<sample name="Back" href="../..">to Cocoon Samples main page</sample>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java Thu Feb 3 08:07:11 2005
@@ -36,7 +36,8 @@
/**
* Test case for CForms's DynamicSelectionList datatype.
- * @version CVS $Id$
+ *
+ * @version $Id$
*/
public class EnumSelectionListTestCase extends ContainerTestCase {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/Sex.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/Sex.java?view=diff&r1=151172&r2=151173
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/Sex.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/Sex.java Thu Feb 3 08:07:11 2005
@@ -18,7 +18,8 @@
/**
* Description of Sex.
- * @version CVS $Id$
+ *
+ * @version $Id$
*/
public class Sex {