joerg 2004/05/11 15:26:20
Modified: src/blocks/woody/conf woody-form.xroles
woody-selection-lists.xroles woody-cache.xroles
woody-datatype.xroles woody-expression.xroles
woody-binding.xroles woody-validators.xroles
src/blocks/woody/samples/forms/binding done.jx
Log:
*** keyword substitution change ***
Revision Changes Path
1.6 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-form.xroles
Index: woody-form.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-form.xroles,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- woody-form.xroles 9 Mar 2004 13:54:11 -0000 1.5
+++ woody-form.xroles 11 May 2004 22:26:20 -0000 1.6
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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>
1.5 +23 -23
cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xroles
Index: woody-selection-lists.xroles
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xroles,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- woody-selection-lists.xroles 9 Mar 2004 13:54:11 -0000 1.4
+++ woody-selection-lists.xroles 11 May 2004 22:26:20 -0000 1.5
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.datatype.SelectionListBuilderSelector']">
-
- <role name="org.apache.cocoon.woody.datatype.SelectionListBuilderSelector"
- shorthand="woody-selection-lists"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-</xroles>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.datatype.SelectionListBuilderSelector']">
+
+ <role name="org.apache.cocoon.woody.datatype.SelectionListBuilderSelector"
+ shorthand="woody-selection-lists"
+
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+</xroles>
1.5 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-cache.xroles
Index: woody-cache.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-cache.xroles,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- woody-cache.xroles 9 Mar 2004 13:54:11 -0000 1.4
+++ woody-cache.xroles 11 May 2004 22:26:20 -0000 1.5
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.CacheManager']">
-
- <role name="org.apache.cocoon.woody.CacheManager"
- shorthand="woody-cachemanager"
- default-class="org.apache.cocoon.woody.DefaultCacheManager"/>
-</xroles>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.CacheManager']">
+
+ <role name="org.apache.cocoon.woody.CacheManager"
+ shorthand="woody-cachemanager"
+ default-class="org.apache.cocoon.woody.DefaultCacheManager"/>
+</xroles>
1.9 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-datatype.xroles
Index: woody-datatype.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-datatype.xroles,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- woody-datatype.xroles 9 Mar 2004 13:54:11 -0000 1.8
+++ woody-datatype.xroles 11 May 2004 22:26:20 -0000 1.9
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.datatype.DatatypeManager']">
-
- <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
- shorthand="woody-datatype"
-
default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
-</xroles>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.datatype.DatatypeManager']">
+
+ <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
+ shorthand="woody-datatype"
+
default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
+</xroles>
1.6 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-expression.xroles
Index: woody-expression.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-expression.xroles,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- woody-expression.xroles 9 Mar 2004 13:54:11 -0000 1.5
+++ woody-expression.xroles 11 May 2004 22:26:20 -0000 1.6
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.expression.ExpressionManager']">
-
- <role name="org.apache.cocoon.woody.expression.ExpressionManager"
- shorthand="woody-expression"
-
default-class="org.apache.cocoon.woody.expression.DefaultExpressionManager"/>
-</xroles>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.expression.ExpressionManager']">
+
+ <role name="org.apache.cocoon.woody.expression.ExpressionManager"
+ shorthand="woody-expression"
+
default-class="org.apache.cocoon.woody.expression.DefaultExpressionManager"/>
+</xroles>
1.6 +24 -24 cocoon-2.1/src/blocks/woody/conf/woody-binding.xroles
Index: woody-binding.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-binding.xroles,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- woody-binding.xroles 9 Mar 2004 13:54:11 -0000 1.5
+++ woody-binding.xroles 11 May 2004 22:26:20 -0000 1.6
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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.5 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-validators.xroles
Index: woody-validators.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-validators.xroles,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- woody-validators.xroles 9 Mar 2004 13:54:11 -0000 1.4
+++ woody-validators.xroles 11 May 2004 22:26:20 -0000 1.5
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector']">
-
- <role
name="org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector"
- shorthand="woody-validators"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-</xroles>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xroles xpath="/role-list" unless="[EMAIL
PROTECTED]'org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector']">
+
+ <role
name="org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector"
+ shorthand="woody-validators"
+
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+</xroles>
1.7 +60 -60 cocoon-2.1/src/blocks/woody/samples/forms/binding/done.jx
Index: done.jx
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/samples/forms/binding/done.jx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- done.jx 9 Mar 2004 13:54:18 -0000 1.6
+++ done.jx 11 May 2004 22:26:20 -0000 1.7
@@ -1,61 +1,61 @@
-<?xml version="1.0"?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
-
- <jx:macro name="dumpBean">
- <jx:parameter name="bean"/>
- <table cellspacing="2" cellpadding="1" bgcolor="#222222">
- <jx:forEach select="#{$bean/*}">
- <tr>
- <td bgcolor="#eeeeee">#{local-name(.)}</td>
- <td bgcolor="#ffffff">
- <jx:choose>
- <jx:when test="#{starts-with(.,'[object ')}">
- <dumpBean bean="#{.}" />
- </jx:when>
- <jx:otherwise>
- #{.}
- </jx:otherwise>
- </jx:choose>
- </td>
- </tr>
- </jx:forEach>
- </table>
- </jx:macro>
-
-
- <title>BindingSample :: Result</title>
- <content>
- <i>Contents of the #{./backendType} BEAN after using the binding for
save():</i>
- <br/>
-
- <blockquote>
- <dumpBean bean="#{./bean}" />
- </blockquote>
-
- <i>Same sample using different backend-models:
- <a href="./binding-#{./sampleCode}-JS.flow">JS</a> -
- <a href="./binding-#{./sampleCode}-Java.flow">Java</a> -
- <a href="./binding-#{./sampleCode}-XML.flow">XML</a>
- </i>
-
- <br/>
-
- <i>Other <a href="./">binding samples</a></i>
-
- </content>
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
+
+ <jx:macro name="dumpBean">
+ <jx:parameter name="bean"/>
+ <table cellspacing="2" cellpadding="1" bgcolor="#222222">
+ <jx:forEach select="#{$bean/*}">
+ <tr>
+ <td bgcolor="#eeeeee">#{local-name(.)}</td>
+ <td bgcolor="#ffffff">
+ <jx:choose>
+ <jx:when test="#{starts-with(.,'[object ')}">
+ <dumpBean bean="#{.}" />
+ </jx:when>
+ <jx:otherwise>
+ #{.}
+ </jx:otherwise>
+ </jx:choose>
+ </td>
+ </tr>
+ </jx:forEach>
+ </table>
+ </jx:macro>
+
+
+ <title>BindingSample :: Result</title>
+ <content>
+ <i>Contents of the #{./backendType} BEAN after using the binding for
save():</i>
+ <br/>
+
+ <blockquote>
+ <dumpBean bean="#{./bean}" />
+ </blockquote>
+
+ <i>Same sample using different backend-models:
+ <a href="./binding-#{./sampleCode}-JS.flow">JS</a> -
+ <a href="./binding-#{./sampleCode}-Java.flow">Java</a> -
+ <a href="./binding-#{./sampleCode}-XML.flow">XML</a>
+ </i>
+
+ <br/>
+
+ <i>Other <a href="./">binding samples</a></i>
+
+ </content>
</page>
