bruno 2003/07/23 02:09:19
Modified: src/blocks/woody/conf woody-binding.xconf
woody-category.xlog woody-target.xlog
Added: src/blocks/woody/conf woody-binding.xroles
woody-datatype.xconf woody-expression.xconf
woody-form.xconf woody-form.xroles
Removed: src/blocks/woody/conf woody.xconf woody.xroles
Log:
Cleaned up xconf/xroles files, added logger attributes, use unless instead of
remove
Revision Changes Path
1.2 +3 -9 cocoon-2.1/src/blocks/woody/conf/woody-binding.xconf
Index: woody-binding.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-binding.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- woody-binding.xconf 22 Jul 2003 11:55:03 -0000 1.1
+++ woody-binding.xconf 23 Jul 2003 09:09:18 -0000 1.2
@@ -1,13 +1,7 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon"
- remove="/cocoon/[EMAIL
PROTECTED]'org.apache.cocoon.woody.binding.BindingManager']">
+<xconf xpath="/cocoon" unless="woody-binding">
- <component
- class="org.apache.cocoon.woody.binding.JXPathBindingManager"
- role="org.apache.cocoon.woody.binding.BindingManager"
- logger="woody.binding" >
- <!-- maybe in future change to woody logging? -->
- </component>
+ <woody-binding logger="woody.binding"/>
-</xconf>
\ No newline at end of file
+</xconf>
1.2 +4 -3 cocoon-2.1/src/blocks/woody/conf/woody-category.xlog
Index: woody-category.xlog
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-category.xlog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- woody-category.xlog 22 Jul 2003 11:55:03 -0000 1.1
+++ woody-category.xlog 23 Jul 2003 09:09:18 -0000 1.2
@@ -4,10 +4,11 @@
be equal to the root elm -->
<xlog xpath="/logkit/categories"
- remove="/logkit/categories/[EMAIL PROTECTED]'woody']">
+ unless="[EMAIL PROTECTED]'woody']">
- <category log-level="debug" name="woody">
+ <category log-level="ERROR" name="woody">
<log-target id-ref="woody" />
+ <log-target id-ref="error"/>
</category>
-</xlog>
\ No newline at end of file
+</xlog>
1.2 +2 -2 cocoon-2.1/src/blocks/woody/conf/woody-target.xlog
Index: woody-target.xlog
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-target.xlog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- woody-target.xlog 22 Jul 2003 11:55:03 -0000 1.1
+++ woody-target.xlog 23 Jul 2003 09:09:18 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xlog xpath="/logkit/targets"
- remove="/logkit/targets/[EMAIL PROTECTED]'woody']">
+ unless="[EMAIL PROTECTED]'woody']">
<cocoon id="woody">
<filename>${context-root}/WEB-INF/logs/woody.log</filename>
@@ -12,4 +12,4 @@
<append>false</append>
</cocoon>
-</xlog>
\ No newline at end of file
+</xlog>
1.1 cocoon-2.1/src/blocks/woody/conf/woody-binding.xroles
Index: woody-binding.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.binding.BindingManager']">
<role name="org.apache.cocoon.woody.binding.BindingManager"
shorthand="woody-binding"
default-class="org.apache.cocoon.woody.binding.JXPathBindingManager"/>
</xroles>
1.1 cocoon-2.1/src/blocks/woody/conf/woody-datatype.xconf
Index: woody-datatype.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="/cocoon" unless="woody-datatype">
<!--
| Woody's datatypes and validation rules.
|-->
<woody-datatype logger="woody">
<datatypes>
<datatype name="string"
src="org.apache.cocoon.woody.datatype.typeimpl.StringTypeBuilder">
<convertors default="dummy" plain="dummy">
<convertor name="dummy"
src="org.apache.cocoon.woody.datatype.convertor.DummyStringConvertorBuilder"/>
</convertors>
</datatype>
<datatype name="long"
src="org.apache.cocoon.woody.datatype.typeimpl.LongTypeBuilder">
<convertors default="plain" plain="plain">
<convertor name="plain"
src="org.apache.cocoon.woody.datatype.convertor.PlainLongConvertorBuilder"/>
</convertors>
</datatype>
<datatype name="date"
src="org.apache.cocoon.woody.datatype.typeimpl.DateTypeBuilder">
<convertors default="formatting" plain="millis">
<convertor name="formatting"
src="org.apache.cocoon.woody.datatype.convertor.FormattingDateConvertorBuilder"/>
<convertor name="millis"
src="org.apache.cocoon.woody.datatype.convertor.MillisDateConvertorBuilder"/>
</convertors>
</datatype>
</datatypes>
<validation-rules>
<validation-rule name="length"
src="org.apache.cocoon.woody.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
<validation-rule name="email"
src="org.apache.cocoon.woody.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
<validation-rule name="value-count"
src="org.apache.cocoon.woody.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
<validation-rule name="range"
src="org.apache.cocoon.woody.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
<validation-rule name="assert"
src="org.apache.cocoon.woody.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
<validation-rule name="mod10"
src="org.apache.cocoon.woody.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
<validation-rule name="regexp"
src="org.apache.cocoon.woody.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
</validation-rules>
</woody-datatype>
</xconf>
1.1 cocoon-2.1/src/blocks/woody/conf/woody-expression.xconf
Index: woody-expression.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="/cocoon" unless="woody-expression">
<woody-expression logger="woody.expression"/>
</xconf>
1.1 cocoon-2.1/src/blocks/woody/conf/woody-form.xconf
Index: woody-form.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="/cocoon" unless="woody-formmanager" logger="woody">
<!--
| Woody's FormManager component
|-->
<woody-formmanager>
<widgets>
<widget name="form"
src="org.apache.cocoon.woody.formmodel.FormDefinitionBuilder"/>
<widget name="field"
src="org.apache.cocoon.woody.formmodel.FieldDefinitionBuilder"/>
<widget name="repeater"
src="org.apache.cocoon.woody.formmodel.RepeaterDefinitionBuilder"/>
<widget name="booleanfield"
src="org.apache.cocoon.woody.formmodel.BooleanFieldDefinitionBuilder"/>
<widget name="multivaluefield"
src="org.apache.cocoon.woody.formmodel.MultiValueFieldDefinitionBuilder"/>
<widget name="button"
src="org.apache.cocoon.woody.formmodel.ButtonDefinitionBuilder"/>
<widget name="aggregatefield"
src="org.apache.cocoon.woody.formmodel.AggregateFieldDefinitionBuilder"/>
</widgets>
</woody-formmanager>
</xconf>
1.1 cocoon-2.1/src/blocks/woody/conf/woody-form.xroles
Index: woody-form.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.FormManager']">
<role name="org.apache.cocoon.woody.FormManager"
shorthand="woody-formmanager"
default-class="org.apache.cocoon.woody.DefaultFormManager"/>
</xroles>
