cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r315057 - in /cocoon/blocks/forms/trunk: WEB-INF/xconf/ conf/
Date Wed, 12 Oct 2005 21:40:23 GMT
Author: vgritsenko
Date: Wed Oct 12 14:40:08 2005
New Revision: 315057

URL: http://svn.apache.org/viewcvs?rev=315057&view=rev
Log:
Clean configuration files: add logger attribute, comments, etc.
Finish up logging config clean up: remove xlog files.

Removed:
    cocoon/blocks/forms/trunk/WEB-INF/xconf/forms.logkit
    cocoon/blocks/forms/trunk/conf/forms-category.xlog
    cocoon/blocks/forms/trunk/conf/forms-target.xlog
Modified:
    cocoon/blocks/forms/trunk/WEB-INF/xconf/cocoon-forms.xconf
    cocoon/blocks/forms/trunk/conf/forms-binding.xconf
    cocoon/blocks/forms/trunk/conf/forms-binding.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-cache.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-datatype.xconf
    cocoon/blocks/forms/trunk/conf/forms-datatype.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-expression.xconf
    cocoon/blocks/forms/trunk/conf/forms-expression.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-form.xconf
    cocoon/blocks/forms/trunk/conf/forms-form.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-generator.xmap
    cocoon/blocks/forms/trunk/conf/forms-selection-lists.xconf
    cocoon/blocks/forms/trunk/conf/forms-selection-lists.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-validators.xconf
    cocoon/blocks/forms/trunk/conf/forms-validators.xroles   (props changed)
    cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xconf
    cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xroles   (props changed)

Modified: cocoon/blocks/forms/trunk/WEB-INF/xconf/cocoon-forms.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/WEB-INF/xconf/cocoon-forms.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/WEB-INF/xconf/cocoon-forms.xconf (original)
+++ cocoon/blocks/forms/trunk/WEB-INF/xconf/cocoon-forms.xconf Wed Oct 12 14:40:08 2005
@@ -15,15 +15,18 @@
   limitations under the License.
 -->
 
-<!--
-  @version $Id$
--->
-
+<!--+
+    | Cocoon Forms Components
+    | @version $Id$
+    +-->
 <components>
   <!-- Include roles -->
   <include src="resource://org/apache/cocoon/forms/forms.roles"/>
 
-  <forms-binding logger="forms.binding">
+  <!--+
+      | Bindings
+      +-->
+  <forms-binding logger="forms.bindings">
     <bindings>
       <binding name="group" src="org.apache.cocoon.forms.binding.GroupJXPathBindingBuilder"/>
       <binding name="value" src="org.apache.cocoon.forms.binding.ValueJXPathBindingBuilder"/>
@@ -50,9 +53,9 @@
   </forms-binding>
 
   <!--+
-      | forms's datatypes and validation rules.
+      | Datatypes and (old style, deprecated) validation rules
       +-->
-  <forms-datatype logger="forms">
+  <forms-datatype logger="forms.types">
     <datatypes>
       <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
         <convertors default="dummy" plain="dummy">
@@ -68,7 +71,7 @@
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
           <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
         </convertors>
-      </datatype>  
+      </datatype>
       <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
         <convertors default="formatting" plain="plain">
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainLongConvertorBuilder"/>
@@ -104,7 +107,7 @@
         <convertors default="plain" plain="plain">
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
         </convertors>
-      </datatype>  
+      </datatype>
       <datatype name="enum" src="org.apache.cocoon.forms.datatype.typeimpl.EnumTypeBuilder">
         <convertors default="enum" plain="enum">
           <convertor name="enum" src="org.apache.cocoon.forms.datatype.convertor.EnumConvertorBuilder"/>
@@ -128,6 +131,9 @@
     </validation-rules>
   </forms-datatype>
 
+  <!--+
+      | Expression language and additional functions
+      +-->
   <forms-expression logger="forms.expression">
     <function name="Null" class="org.apache.cocoon.forms.expression.NullFunction"/>
     <function name="IsNull" class="org.apache.cocoon.forms.expression.IsNullFunction"/>
@@ -135,9 +141,9 @@
   </forms-expression>
 
   <!--+
-      | forms's FormManager component
+      | FormManager component and form model definition
       +-->
-  <forms-formmanager>
+  <forms-formmanager logger="forms.model">
     <widgets>
       <widget name="form" src="org.apache.cocoon.forms.formmodel.FormDefinitionBuilder"/>
       <widget name="import" src="org.apache.cocoon.forms.formmodel.ImportDefinitionBuilder"/>
@@ -166,14 +172,20 @@
     </widgets>
   </forms-formmanager>
 
-  <forms-selection-lists default="default">
+  <!--+
+      | Selection lists
+      +-->
+  <forms-selection-lists logger="forms.lists" default="default">
     <selection-list name="default" class="org.apache.cocoon.forms.datatype.DefaultSelectionListBuilder"/>
     <selection-list name="flow-jxpath" class="org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder"/>
     <selection-list name="enum" class="org.apache.cocoon.forms.datatype.EnumSelectionListBuilder"/>
     <selection-list name="java" class="org.apache.cocoon.forms.datatype.JavaSelectionListBuilder"/>
   </forms-selection-lists>
-  
-  <forms-validators>
+
+  <!--+
+      | Validators
+      +-->
+  <forms-validators logger="forms.validators">
     <!-- new-style validators -->
     <validator name="javascript" class="org.apache.cocoon.forms.validation.impl.JavaScriptValidatorBuilder"/>
     <validator name="length" class="org.apache.cocoon.forms.validation.impl.LengthValidatorBuilder"/>
@@ -186,7 +198,10 @@
     <validator name="captcha" class="org.apache.cocoon.forms.validation.impl.CaptchaValidatorBuilder"/>
   </forms-validators>
 
-  <forms-widgetlisteners>
+  <!--+
+      | Widget listeners
+      +-->
+  <forms-widgetlisteners logger="forms.listeners">
     <listener name="java" class="org.apache.cocoon.forms.event.impl.JavaClassWidgetListenerBuilder"/>
     <listener name="javascript" class="org.apache.cocoon.forms.event.impl.JavaScriptWidgetListenerBuilder"/>
   </forms-widgetlisteners>
@@ -202,7 +217,6 @@
   <generators>
     <generator name="forms" logger="forms" src="org.apache.cocoon.forms.generation.FormsGenerator"/>
   </generators>
-
   <transformers>
     <transformer name="forms" logger="forms" src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"/>
   </transformers>

Modified: cocoon/blocks/forms/trunk/conf/forms-binding.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-binding.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-binding.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-binding.xconf Wed Oct 12 14:40:08 2005
@@ -15,9 +15,13 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-binding">
-       
-  <forms-binding logger="forms.binding">
+
+  <!--+
+      | Cocoon Forms bindings
+      +-->
+  <forms-binding logger="forms.bindings">
     <bindings>
       <binding name="value" src="org.apache.cocoon.forms.binding.ValueJXPathBindingBuilder"/>
       <binding name="multi-value" src="org.apache.cocoon.forms.binding.MultiValueJXPathBindingBuilder"/>

Propchange: cocoon/blocks/forms/trunk/conf/forms-binding.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-binding.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/blocks/forms/trunk/conf/forms-cache.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-cache.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-datatype.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-datatype.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-datatype.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-datatype.xconf Wed Oct 12 14:40:08 2005
@@ -15,12 +15,13 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-datatype">
 
   <!--+
-      | forms's datatypes and validation rules.
+      | Cocoon Forms datatypes and validation rules
       +-->
-  <forms-datatype logger="forms">
+  <forms-datatype logger="forms.types">
     <datatypes>
       <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
         <convertors default="dummy" plain="dummy">
@@ -33,7 +34,7 @@
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
           <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
         </convertors>
-      </datatype>  
+      </datatype>
       <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
         <convertors default="formatting" plain="plain">
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainLongConvertorBuilder"/>
@@ -69,7 +70,7 @@
         <convertors default="plain" plain="plain">
           <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
         </convertors>
-      </datatype>  
+      </datatype>
       <datatype name="enum" src="org.apache.cocoon.forms.datatype.typeimpl.EnumTypeBuilder">
         <convertors default="enum" plain="enum">
           <convertor name="enum" src="org.apache.cocoon.forms.datatype.convertor.EnumConvertorBuilder"/>
@@ -81,6 +82,7 @@
         </convertors>
       </datatype>
     </datatypes>
+
     <validation-rules>
       <!-- old-style datatype validators (deprecated) -->
       <validation-rule name="length" src="org.apache.cocoon.forms.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
@@ -92,5 +94,5 @@
       <validation-rule name="regexp" src="org.apache.cocoon.forms.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
     </validation-rules>
   </forms-datatype>
-  
+
 </xconf>

Propchange: cocoon/blocks/forms/trunk/conf/forms-datatype.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-datatype.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-expression.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-expression.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-expression.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-expression.xconf Wed Oct 12 14:40:08 2005
@@ -15,11 +15,16 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-expression">
 
+  <!--+
+      | Cocoon Forms expression language and additional functions
+      +-->
   <forms-expression logger="forms.expression">
     <function name="Null" class="org.apache.cocoon.forms.expression.NullFunction"/>
     <function name="IsNull" class="org.apache.cocoon.forms.expression.IsNullFunction"/>
     <function name="String" class="org.apache.cocoon.forms.expression.StringFunction"/>
   </forms-expression>
+
 </xconf>

Propchange: cocoon/blocks/forms/trunk/conf/forms-expression.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-expression.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-form.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-form.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-form.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-form.xconf Wed Oct 12 14:40:08 2005
@@ -15,12 +15,13 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-formmanager" logger="forms">
 
   <!--+
-      | forms's FormManager component
+      | Cocoon Forms FormManager component and form model definition
       +-->
-  <forms-formmanager>
+  <forms-formmanager logger="forms.model">
     <widgets>
       <widget name="form" src="org.apache.cocoon.forms.formmodel.FormDefinitionBuilder"/>
       <widget name="import" src="org.apache.cocoon.forms.formmodel.ImportDefinitionBuilder"/>

Propchange: cocoon/blocks/forms/trunk/conf/forms-form.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-form.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-generator.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-generator.xmap?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-generator.xmap (original)
+++ cocoon/blocks/forms/trunk/conf/forms-generator.xmap Wed Oct 12 14:40:08 2005
@@ -14,6 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <xmap xmlns:map="http://apache.org/cocoon/sitemap/1.0"
       xpath="/sitemap/components/generators" unless="generator[@name='forms']">
     <map:generator name="forms" logger="forms"

Modified: cocoon/blocks/forms/trunk/conf/forms-selection-lists.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-selection-lists.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-selection-lists.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-selection-lists.xconf Wed Oct 12 14:40:08 2005
@@ -15,13 +15,17 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-selection-lists">
 
-  <forms-selection-lists default="default">
+  <!--+
+      | Cocoon Forms selection lists
+      +-->
+  <forms-selection-lists logger="forms.lists" default="default">
     <selection-list name="default" class="org.apache.cocoon.forms.datatype.DefaultSelectionListBuilder"/>
     <selection-list name="flow-jxpath" class="org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder"/>
     <selection-list name="enum" class="org.apache.cocoon.forms.datatype.EnumSelectionListBuilder"/>
     <selection-list name="java" class="org.apache.cocoon.forms.datatype.JavaSelectionListBuilder"/>
   </forms-selection-lists>
-  
+
 </xconf>

Propchange: cocoon/blocks/forms/trunk/conf/forms-selection-lists.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-selection-lists.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-validators.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-validators.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-validators.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-validators.xconf Wed Oct 12 14:40:08 2005
@@ -15,9 +15,13 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-validators">
 
-  <forms-validators>
+  <!--+
+      | Cocoon Forms validators
+      +-->
+  <forms-validators logger="forms.validators">
     <!-- new-style validators -->
     <validator name="javascript" class="org.apache.cocoon.forms.validation.impl.JavaScriptValidatorBuilder"/>
     <validator name="length" class="org.apache.cocoon.forms.validation.impl.LengthValidatorBuilder"/>

Propchange: cocoon/blocks/forms/trunk/conf/forms-validators.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-validators.xroles
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xconf?rev=315057&r1=315056&r2=315057&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xconf (original)
+++ cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xconf Wed Oct 12 14:40:08 2005
@@ -15,11 +15,15 @@
   limitations under the License.
 -->
 
+<!-- $Id$ -->
 <xconf xpath="/cocoon" unless="@version != '2.1' or forms-widgetlisteners">
 
-  <forms-widgetlisteners>
+  <!--+
+      | Cocoon Forms form widget listeners
+      +-->
+  <forms-widgetlisteners logger="forms.listeners">
     <listener name="java" class="org.apache.cocoon.forms.event.impl.JavaClassWidgetListenerBuilder"/>
     <listener name="javascript" class="org.apache.cocoon.forms.event.impl.JavaScriptWidgetListenerBuilder"/>
   </forms-widgetlisteners>
 
-</xconf>
\ No newline at end of file
+</xconf>

Propchange: cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xroles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/forms/trunk/conf/forms-widgetlisteners.xroles
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message