dflorey 2004/08/04 08:27:25
Modified: projector/src/content/applications/admin/templates
addMembershipTable.tmpl
projector/src/content/applications/admin/jobs listUsers.xml
updateUsers.xml listRoles.xml updateRoles.xml
projector/src/content/applications/core application.xml
projector/src/content/applications/admin/config jobs.xml
projector/src/content/applications/admin/security login.xml
createRole.xml createUser.xml deleteUser.xml
deleteRole.xml
projector/src/content/applications/admin/site index.xml
editUser.xml listUsers.xml createUser.xml page.xml
listRoles.xml createRole.xml
projector/src/content/applications/core/site exception.xml
projector/src/content/applications/core/templates/page
3Columns.xml
projector/src/content/applications/core/style style.xml
projector/src/content/applications/core/i18n exceptions.xml
Log:
Updated admin application
Revision Changes Path
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/templates/addMembershipTable.tmpl
Index: addMembershipTable.tmpl
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/templates/addMembershipTable.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addMembershipTable.tmpl 22 Jul 2004 12:18:37 -0000 1.1
+++ addMembershipTable.tmpl 4 Aug 2004 15:27:21 -0000 1.2
@@ -6,7 +6,7 @@
<tr><td class="default" width="32px"><img src="<%principal-icon;optional%>"
/></td><td class="default"><%displayname%></td><td class="default" width="20px"><a
href="<%add-processor;optional%>?user=<%user;optional%>&role=<%uri%>"><img
src="<%processor-icon;optional%>" /></a></td></tr>
<!--*** End of 'default' ***-->
<!--*** Start of 'even' ***-->
-<tr><td class="even" width="32px"><img src="<%principal-icon;optional%>" /></td><td
class="even"><%displayname%></td><td class="even" width="20px"><a
href="<%add-processor%>?user=<%user;optional%>&role=<%uri%>"><img
src="<%processor-icon;optional%>" /></a></td></tr>
+<tr><td class="even" width="32px"><img src="<%principal-icon;optional%>" /></td><td
class="even"><%displayname%></td><td class="even" width="20px"><a
href="<%add-processor;optional%>?user=<%user;optional%>&role=<%uri%>"><img
src="<%processor-icon;optional%>" /></a></td></tr>
<!--*** End of 'even' ***-->
<!--*** Start of 'footer' ***-->
</table>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/jobs/listUsers.xml
Index: listUsers.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/jobs/listUsers.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listUsers.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ listUsers.xml 4 Aug 2004 15:27:21 -0000 1.2
@@ -15,7 +15,7 @@
</step>
<step id="usersCached" processor="echo">
- <load parameter="input"><value store="cache"
key="users"></value></load>
+ <load parameter="input"><value store="cache" key="users" /></load>
<save result="output" store="output" key="output" />
<route state="ok" return="usersAvailable"/>
</step>
1.2 +2 -2
jakarta-slide/projector/src/content/applications/admin/jobs/updateUsers.xml
Index: updateUsers.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/jobs/updateUsers.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- updateUsers.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ updateUsers.xml 4 Aug 2004 15:27:21 -0000 1.2
@@ -19,8 +19,8 @@
</description>
<step id="disposeUsers" processor="dispose">
- <load parameter="store"><value>cache</value></load>
- <load parameter="key"><value>users</value></load>
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>users</string></load>
<route state="ok" step="listUsers"/>
</step>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/jobs/listRoles.xml
Index: listRoles.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/jobs/listRoles.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listRoles.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ listRoles.xml 4 Aug 2004 15:27:21 -0000 1.2
@@ -15,7 +15,7 @@
</step>
<step id="rolesCached" processor="echo">
- <load parameter="input"><value store="cache"
key="roles"></value></load>
+ <load parameter="input"><value store="cache" key="roles" /></load>
<save result="output" store="output" key="output" />
<route state="ok" return="rolesAvailable"/>
</step>
1.2 +2 -2
jakarta-slide/projector/src/content/applications/admin/jobs/updateRoles.xml
Index: updateRoles.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/jobs/updateRoles.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- updateRoles.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ updateRoles.xml 4 Aug 2004 15:27:21 -0000 1.2
@@ -19,8 +19,8 @@
</description>
<step id="disposeRoles" processor="dispose">
- <load parameter="store"><value>cache</value></load>
- <load parameter="key"><value>roles</value></load>
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>roles</string></load>
<route state="ok" step="listRoles"/>
</step>
1.2 +11 -11
jakarta-slide/projector/src/content/applications/core/application.xml
Index: application.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/core/application.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- application.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ application.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -9,17 +9,17 @@
<classpath uri="classes/" />
</classpaths>
<resource-types>
- <resource-type name="Resource"
class="org.apache.slide.projector.descriptor.ResourceValueDescriptorFactory" />
- <resource-type name="Boolean"
class="org.apache.slide.projector.descriptor.BooleanValueDescriptorFactory" />
- <resource-type name="String"
class="org.apache.slide.projector.descriptor.StringValueDescriptorFactory" />
- <resource-type name="Number"
class="org.apache.slide.projector.descriptor.NumberValueDescriptorFactory" />
- <resource-type name="URI"
class="org.apache.slide.projector.descriptor.URIValueDescriptorFactory" />
- <resource-type name="Locale"
class="org.apache.slide.projector.descriptor.LocaleValueDescriptorFactory" />
- <resource-type name="Date"
class="org.apache.slide.projector.descriptor.DateValueDescriptorFactory" />
- <resource-type name="Message"
class="org.apache.slide.projector.descriptor.MessageValueDescriptorFactory" />
- <resource-type name="Array"
class="org.apache.slide.projector.descriptor.ArrayValueDescriptorFactory" />
- <resource-type name="Map"
class="org.apache.slide.projector.descriptor.MapValueDescriptorFactory" />
- <resource-type name="XML"
class="org.apache.slide.projector.descriptor.XMLValueDescriptorFactory" />
+ <resource-type name="Resource"
class="org.apache.slide.projector.descriptor.AnyValueFactory" />
+ <resource-type name="Boolean"
class="org.apache.slide.projector.descriptor.BooleanValueFactory" />
+ <resource-type name="String"
class="org.apache.slide.projector.descriptor.StringValueFactory" />
+ <resource-type name="Number"
class="org.apache.slide.projector.descriptor.NumberValueFactory" />
+ <resource-type name="URI"
class="org.apache.slide.projector.descriptor.URIValueFactory" />
+ <resource-type name="Locale"
class="org.apache.slide.projector.descriptor.LocaleValueFactory" />
+ <resource-type name="Date"
class="org.apache.slide.projector.descriptor.DateValueFactory" />
+ <resource-type name="Message"
class="org.apache.slide.projector.descriptor.MessageValueFactory" />
+ <resource-type name="Array"
class="org.apache.slide.projector.descriptor.ArrayValueFactory" />
+ <resource-type name="Map"
class="org.apache.slide.projector.descriptor.MapValueFactory" />
+ <resource-type name="XML"
class="org.apache.slide.projector.descriptor.XMLValueFactory" />
</resource-types>
<content>
<processors uri="config/coreProcessors.xml" />
1.2 +15 -15
jakarta-slide/projector/src/content/applications/admin/config/jobs.xml
Index: jobs.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/config/jobs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jobs.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ jobs.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -6,27 +6,27 @@
<load parameter="parameters">
<map>
<entry key="key">
- <value>users</value>
+ <string>users</string>
</entry>
<entry key="store">
- <value>cache</value>
+ <string>cache</string>
</entry>
</map>
</load>
<load parameter="condition">
- <value><![CDATA[<event method="Update">
+ <xml><event method="Update">
<property key="uri" value="/users"/>
<property key="depth" value="1"/>
- </event>]]></value>
+ </event></xml>
</load>
<load parameter="repeat">
- <value>true</value>
+ <string>true</string>
</load>
<load parameter="persistent">
- <value>true</value>
+ <string>true</string>
</load>
<load parameter="processor">
- <value>updateUsers</value>
+ <string>updateUsers</string>
</load>
</job>
@@ -37,27 +37,27 @@
<load parameter="parameters">
<map>
<entry key="key">
- <value>roles</value>
+ <string>roles</string>
</entry>
<entry key="store">
- <value>cache</value>
+ <string>cache</string>
</entry>
</map>
</load>
<load parameter="condition">
- <value><![CDATA[<event method="Update">
- <property key="uri" value="/roles"/>
+ <xml><event method="Update">
+ <property key="uri" value="/roles"/>
<property key="depth" value="1"/>
- </event>]]></value>
+ </event></xml>
</load>
<load parameter="repeat">
- <value>true</value>
+ <string>true</string>
</load>
<load parameter="persistent">
- <value>true</value>
+ <string>true</string>
</load>
<load parameter="processor">
- <value>updateRoles</value>
+ <string>updateRoles</string>
</load>
</job>
</jobs>
1.2 +24 -24
jakarta-slide/projector/src/content/applications/admin/security/login.xml
Index: login.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/login.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- login.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ login.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -13,39 +13,39 @@
</step>
<step id="loginForm" processor="loginForm">
- <load parameter="action"><value>login</value></load>
- <load parameter="errorsProcessor"><value>errors</value></load>
- <load parameter="title"><value>Login:</value></load>
+ <load parameter="action"><string>login</string></load>
+ <load parameter="errorsProcessor"><string>errors</string></load>
+ <load parameter="title"><string>Login:</string></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="control:loginfield">
<map>
- <entry key="parameter"><value>username</value></entry>
- <entry key="control"><value>textfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>username</string></entry>
+ <entry key="control"><string>textfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="control:passwordfield">
<map>
- <entry key="parameter"><value>password</value></entry>
- <entry
key="control"><value>passwordfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>password</string></entry>
+ <entry
key="control"><string>passwordfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="trigger:reset">
<map>
- <entry key="validate"><value>false</value></entry>
- <entry key="step"><value>clearForm</value></entry>
- <entry
key="trigger"><value>imageTrigger</value></entry>
- <entry key="image"><value processor="image"
result="url">/contelligent/images/right.gif</value></entry>
+ <entry key="validate"><string>false</string></entry>
+ <entry key="step"><string>clearForm</string></entry>
+ <entry
key="trigger"><string>imageTrigger</string></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
</map>
</load>
<load parameter="trigger:login">
<map>
- <entry key="action"><value>login</value></entry>
- <entry key="validate"><value>true</value></entry>
- <entry key="step"><value>login</value></entry>
- <entry
key="trigger"><value>imageTrigger</value></entry>
- <entry key="image"><value processor="image"
result="url">/contelligent/images/right.gif</value></entry>
+ <entry key="action"><string>login</string></entry>
+ <entry key="validate"><string>true</string></entry>
+ <entry key="step"><string>login</string></entry>
+ <entry
key="trigger"><string>imageTrigger</string></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
@@ -66,15 +66,15 @@
</step>
<step id="logoutForm" processor="logoutForm">
- <load parameter="action"><value>logout</value></load>
- <load parameter="title"><value>Logout:</value></load>
+ <load parameter="action"><string>logout</string></load>
+ <load parameter="title"><string>Logout:</string></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="trigger:logout">
<map>
- <entry key="step"><value>logout</value></entry>
- <entry key="wizard"><value>true</value></entry>
- <entry
key="trigger"><value>imageTrigger</value></entry>
- <entry key="image"><value processor="image"
result="url">/contelligent/images/right.gif</value></entry>
+ <entry key="step"><string>logout</string></entry>
+ <entry key="wizard"><string>true</string></entry>
+ <entry
key="trigger"><string>imageTrigger</string></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
1.2 +13 -13
jakarta-slide/projector/src/content/applications/admin/security/createRole.xml
Index: createRole.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/createRole.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createRole.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ createRole.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -8,23 +8,23 @@
</description>
<step id="form" processor="createRoleForm">
- <load parameter="action"><value>createRole</value></load>
- <load parameter="errorsProcessor"><value>errors</value></load>
- <load parameter="title"><value>Create role:</value></load>
+ <load parameter="action"><string>createRole</string></load>
+ <load parameter="errorsProcessor"><string>errors</string></load>
+ <load parameter="title"><string>Create role:</string></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="control:rolename">
<map>
- <entry key="parameter"><value>rolename</value></entry>
- <entry key="control"><value>textfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>rolename</string></entry>
+ <entry key="control"><string>textfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="trigger:create">
<map>
- <entry key="validate"><value>true</value></entry>
- <entry key="step"><value>create</value></entry>
- <entry
key="trigger"><value>imageTrigger</value></entry>
- <entry key="image"><value processor="image"
result="url">/contelligent/images/right.gif</value></entry>
+ <entry key="validate"><string>true</string></entry>
+ <entry key="step"><string>create</string></entry>
+ <entry
key="trigger"><string>imageTrigger</string></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
@@ -41,8 +41,8 @@
</step>
<step id="disposeRoles" processor="dispose">
- <load parameter="store"><value>cache</value></load>
- <load parameter="key"><value>roles</value></load>
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>roles</string></load>
<route state="ok" step="clearForm"/>
</step>
@@ -51,7 +51,7 @@
</step>
<step id="success" processor="bookmark">
- <load parameter="bookmark"><value>listRoles.html</value></load>
+ <load parameter="bookmark"><string>listRoles.html</string></load>
<route state="ok" return="ok" />
</step>
</process>
1.2 +25 -19
jakarta-slide/projector/src/content/applications/admin/security/createUser.xml
Index: createUser.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/createUser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createUser.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ createUser.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -8,37 +8,37 @@
</description>
<step id="form" processor="createUserForm">
- <load parameter="action"><value>createUser</value></load>
- <load parameter="errorsProcessor"><value>errors</value></load>
- <load parameter="title"><value>Create account:</value></load>
+ <load parameter="action"><string>createUser</string></load>
+ <load parameter="errorsProcessor"><string>errors</string></load>
+ <load parameter="title"><string>Create account:</string></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="control:username">
<map>
- <entry key="parameter"><value>username</value></entry>
- <entry key="control"><value>textfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>username</string></entry>
+ <entry key="control"><string>textfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="control:password">
<map>
- <entry key="parameter"><value>password</value></entry>
- <entry
key="control"><value>passwordfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>password</string></entry>
+ <entry
key="control"><string>passwordfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="control:retypePassword">
<map>
- <entry
key="parameter"><value>retypePassword</value></entry>
- <entry
key="control"><value>passwordfield</value></entry>
- <entry
key="controlContainer"><value>verticalControl</value></entry>
+ <entry
key="parameter"><string>retypePassword</string></entry>
+ <entry
key="control"><string>passwordfield</string></entry>
+ <entry
key="controlContainer"><string>verticalControl</string></entry>
</map>
</load>
<load parameter="trigger:create">
<map>
- <entry key="validate"><value>true</value></entry>
- <entry key="step"><value>create</value></entry>
- <entry
key="trigger"><value>imageTrigger</value></entry>
- <entry key="image"><value processor="image"
result="url">/contelligent/images/right.gif</value></entry>
+ <entry key="validate"><string>true</string></entry>
+ <entry key="step"><string>create</string></entry>
+ <entry
key="trigger"><string>imageTrigger</string></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
@@ -58,16 +58,22 @@
<step id="addRole" processor="addRole">
<load parameter="user"><value key="user"/></load>
- <load parameter="role"><value>/roles/user</value></load>
- <route state="ok" step="clearForm" />
+ <load parameter="role"><string>/roles/user</string></load>
+ <route state="ok" step="disposeUsers" />
</step>
+ <step id="disposeUsers" processor="dispose">
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>users</string></load>
+ <route state="ok" step="clearForm"/>
+ </step>
+
<step id="clearForm" processor="clearForm">
<route state="ok" step="success"/>
</step>
<step id="success" processor="bookmark">
- <load parameter="bookmark"><value>listUsers.html</value></load>
+ <load parameter="bookmark"><string>listUsers.html</string></load>
<route state="ok" return="ok" />
</step>
</process>
1.2 +2 -2
jakarta-slide/projector/src/content/applications/admin/security/deleteUser.xml
Index: deleteUser.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/deleteUser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deleteUser.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ deleteUser.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -18,8 +18,8 @@
</step>
<step id="disposeUsers" processor="dispose">
- <load parameter="store"><value>cache</value></load>
- <load parameter="key"><value>users</value></load>
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>users</string></load>
<route state="ok" step="page"/>
</step>
1.2 +2 -2
jakarta-slide/projector/src/content/applications/admin/security/deleteRole.xml
Index: deleteRole.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/deleteRole.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deleteRole.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ deleteRole.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -18,8 +18,8 @@
</step>
<step id="disposeRoles" processor="dispose">
- <load parameter="store"><value>cache</value></load>
- <load parameter="key"><value>roles</value></load>
+ <load parameter="store"><string>cache</string></load>
+ <load parameter="key"><string>roles</string></load>
<route state="ok" step="page"/>
</step>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/site/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ index.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -9,7 +9,7 @@
<step id="compose" processor="page">
<load parameter="content"><value processor="menuComposer"
result="sideMenu"/></load>
- <load parameter="right"><value>Rechts</value></load>
+ <load parameter="right"><string>Rechts</string></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +28 -28
jakarta-slide/projector/src/content/applications/admin/site/editUser.xml
Index: editUser.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/editUser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- editUser.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ editUser.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -26,27 +26,27 @@
</step>
<step id="renderMembership" processor="membershipTable">
- <load parameter="principal-header"><value
processor="message">membership</value></load>
- <load parameter="creation-header"><value>Creation date</value></load>
+ <load parameter="principal-header"><value
processor="message"><string>membership</string></value></load>
+ <load parameter="creation-header"><string>Creation date</string></load>
<load parameter="user"><value store="input" key="uri"/></load>
- <load parameter="principal-icon"><value processor="image"
result="url">/projector/applications/admin/images/role.gif</value></load>
- <load parameter="delete-icon"><value processor="image"
result="url">/projector/applications/admin/images/delete-role.png</value></load>
- <load parameter="delete-processor"><value
processor="url">admin/removeRole</value></load>
+ <load parameter="principal-icon"><value processor="image"
result="url"><string>/projector/applications/admin/images/role.gif</string></value></load>
+ <load parameter="delete-icon"><value processor="image"
result="url"><string>/projector/applications/admin/images/delete-role.png</string></value></load>
+ <load parameter="delete-processor"><value
processor="url"><string>admin/removeRole</string></value></load>
<load parameter="input"><value key="roles" /></load>
- <load parameter="offset"><value>0</value></load>
- <load parameter="itemsPerPage"><value>4</value></load>
- <load parameter="id"><value>membershipTable</value></load>
- <load parameter="store"><value>session</value></load>
+ <load parameter="offset"><string>0</string></load>
+ <load parameter="itemsPerPage"><string>4</string></load>
+ <load parameter="id"><string>membershipTable</string></load>
+ <load parameter="store"><string>session</string></load>
<save result="output" key="membership" />
<route state="ok" step="membershipPager" />
</step>
<step id="membershipPager" processor="simplePager">
- <load parameter="showRange"><value>false</value></load>
- <load parameter="id"><value>membershipTable</value></load>
- <load parameter="store"><value>session</value></load>
- <load parameter="showRange"><value>true</value></load>
- <load parameter="range"><value>3</value></load>
+ <load parameter="showRange"><string>false</string></load>
+ <load parameter="id"><string>membershipTable</string></load>
+ <load parameter="store"><string>session</string></load>
+ <load parameter="showRange"><string>true</string></load>
+ <load parameter="range"><string>3</string></load>
<load parameter="parameter">
<map>
<entry key="uri"><value store="input"
key="uri"/></entry>
@@ -65,26 +65,26 @@
</step>
<step id="renderRoles" processor="addMembershipTable">
- <load parameter="principal-header"><value
processor="message">availableRoles</value></load>
+ <load parameter="principal-header"><value
processor="message"><string>availableRoles</string></value></load>
<load parameter="user"><value store="input" key="uri"/></load>
- <load parameter="principal-icon"><value processor="image"
result="url">/projector/applications/admin/images/role.gif</value></load>
- <load parameter="processor-icon"><value processor="image"
result="url">/projector/applications/admin/images/delete-role.png</value></load>
- <load parameter="add-processor"><value
processor="url">admin/addRole</value></load>
+ <load parameter="principal-icon"><value processor="image"
result="url"><string>/projector/applications/admin/images/role.gif</string></value></load>
+ <load parameter="processor-icon"><value processor="image"
result="url"><string>/projector/applications/admin/images/delete-role.png</string></value></load>
+ <load parameter="add-processor"><value
processor="url"><string>admin/addRole</string></value></load>
<load parameter="input"><value key="roles" /></load>
- <load parameter="offset"><value>0</value></load>
- <load parameter="itemsPerPage"><value>4</value></load>
- <load parameter="id"><value>rolesTable</value></load>
- <load parameter="store"><value>session</value></load>
+ <load parameter="offset"><string>0</string></load>
+ <load parameter="itemsPerPage"><string>4</string></load>
+ <load parameter="id"><string>rolesTable</string></load>
+ <load parameter="store"><string>session</string></load>
<save result="output" key="roles" />
<route state="ok" step="rolesPager" />
</step>
<step id="rolesPager" processor="simplePager">
- <load parameter="showRange"><value>false</value></load>
- <load parameter="id"><value>rolesTable</value></load>
- <load parameter="store"><value>session</value></load>
- <load parameter="showRange"><value>true</value></load>
- <load parameter="range"><value>3</value></load>
+ <load parameter="showRange"><string>false</string></load>
+ <load parameter="id"><string>rolesTable</string></load>
+ <load parameter="store"><string>session</string></load>
+ <load parameter="showRange"><string>true</string></load>
+ <load parameter="range"><string>3</string></load>
<load parameter="parameter">
<map>
<entry key="uri"><value store="input"
key="uri"/></entry>
@@ -107,7 +107,7 @@
<step id="compose" processor="page">
<load parameter="content"><value key="content" /></load>
- <load parameter="right"><value>Rechts</value></load>
+ <load parameter="right"><string>Rechts</string></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +50 -43
jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml
Index: listUsers.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listUsers.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ listUsers.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -18,85 +18,92 @@
<route state="noUsersAvailable" step="renderNoUser" />
</step>
+ <step id="saveRenderUser" processor="echo">
+ <load parameter="input"><value key="users" /></load>
+ <save result="output" store="repository"
key="/files/Locale:{session:locale}locale:{session:locale}:users.xml" />
+ <route state="ok" step="renderUser"/>
+ </step>
+
<step id="renderUser" processor="table/default">
<load parameter="columns">
<array>
<map>
- <entry key="header"><value></value></entry>
- <entry
key="processor"><value>admin/table/column/trigger</value></entry>
+ <entry key="header"><string></string></entry>
+ <entry
key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value
processor="image"
result="url">/projector/applications/admin/images/user.gif</value></entry>
- <entry key="target"><value
processor="url">editUser.html</value></entry>
- <entry
key="style"><value>width: 24px;</value></entry>
+ <entry key="src"><value
processor="image"
result="url"><string>/projector/applications/admin/images/user.gif</string></value></entry>
+ <entry key="target"><value
processor="url"><string>editUser.html</string></value></entry>
+ <entry
key="style"><string>width: 24px;</string></entry>
</map>
</entry>
- <entry
key="result"><value>output</value></entry>
- <entry
key="replaceColumn"><value>true</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>false</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry
key="replaceColumn"><string>true</string></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>false</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
</map>
<map>
- <entry key="header"><value
processor="message">user</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>true</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry key="header"><value
processor="message"><string>user</string></value></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>true</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
</map>
<map>
- <entry key="header"><value
processor="message">creationDate</value></entry>
- <entry
key="processor"><value>dateFormatter</value></entry>
+ <entry key="header"><value
processor="message"><string>creationDate</string></value></entry>
+ <entry
key="processor"><string>dateFormatter</string></entry>
<entry key="parameters">
<map>
- <entry
key="timeFormat"><value>short</value></entry>
- <entry
key="dateFormat"><value>full</value></entry>
+ <entry
key="timeFormat"><string>short</string></entry>
+ <entry
key="dateFormat"><string>full</string></entry>
</map>
</entry>
- <entry
key="result"><value>output</value></entry>
- <entry key="name"><value>date</value></entry>
- <entry
key="key"><value>creationdate</value></entry>
- <entry
key="sortable"><value>true</value></entry>
- <entry
key="resizable"><value>true</value></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry key="name"><string>date</string></entry>
+ <entry
key="key"><string>creationdate</string></entry>
+ <entry
key="sortable"><string>true</string></entry>
+ <entry
key="resizable"><string>true</string></entry>
</map>
<map>
- <entry key="header"><value></value></entry>
- <entry
key="processor"><value>admin/table/column/trigger</value></entry>
+ <entry key="header"><string></string></entry>
+ <entry
key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value
processor="image"
result="url">/projector/applications/admin/images/delete-user.png</value></entry>
- <entry key="target"><value
processor="url">admin/deleteUser</value></entry>
- <entry
key="style"><value>width: 24px;</value></entry>
+ <entry key="src"><value
processor="image"
result="url"><string>/projector/applications/admin/images/delete-user.png</string></value></entry>
+ <entry key="target"><value
processor="url"><string>admin/deleteUser</string></value></entry>
+ <entry
key="style"><string>width: 24px;</string></entry>
</map>
</entry>
- <entry
key="result"><value>output</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>false</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>false</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
+ <entry
key="replaceColumn"><string>true</string></entry>
</map>
</array>
</load>
<load parameter="input"><value key="users" /></load>
- <load parameter="offset"><value>0</value></load>
- <load parameter="itemsPerPage"><value>4</value></load>
- <load parameter="id"><value>userTable</value></load>
- <load parameter="store"><value>session</value></load>
+ <load parameter="offset"><string>0</string></load>
+ <load parameter="itemsPerPage"><string>4</string></load>
+ <load parameter="id"><string>userTable</string></load>
+ <load parameter="store"><string>session</string></load>
<save result="output" key="user" />
<route state="ok" step="userPager" />
</step>
<step id="userPager" processor="simplePager">
- <load parameter="showRange"><value>false</value></load>
- <load parameter="id"><value>userTable</value></load>
- <load parameter="store"><value>session</value></load>
- <load parameter="showRange"><value>true</value></load>
- <load parameter="range"><value>3</value></load>
+ <load parameter="showRange"><string>false</string></load>
+ <load parameter="id"><string>userTable</string></load>
+ <load parameter="store"><string>session</string></load>
+ <load parameter="showRange"><string>true</string></load>
+ <load parameter="range"><string>3</string></load>
<save result="output" key="pager" />
<route state="failed" step="composePage"/>
<route state="ok" step="content"/>
</step>
<step id="renderNoUser" processor="echo">
- <load parameter="input"><value>No user found</value></load>
+ <load parameter="input"><string>No user found</string></load>
<save result="output" key="content" />
<route state="ok" step="compose" />
</step>
@@ -115,7 +122,7 @@
<step id="compose" processor="page">
<load parameter="content"><value key="content"/></load>
<load parameter="right"><value key="form"/></load>
- <load parameter="style"><value
processor="url">style.html</value></load>
+ <load parameter="style"><value
processor="url"><string>style.html</string></value></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/site/createUser.xml
Index: createUser.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/createUser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createUser.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ createUser.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -14,7 +14,7 @@
<step id="compose" processor="page">
<load parameter="content"><value key="form" /></load>
- <load parameter="right"><value>Rechts</value></load>
+ <load parameter="right"><string>Rechts</string></load>
<save result="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +6 -6
jakarta-slide/projector/src/content/applications/admin/site/page.xml
Index: page.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ page.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -3,10 +3,10 @@
<description>
<input>
<parameter name="content">
- <resource />
+ <value />
</parameter>
<parameter name="right">
- <resource />
+ <value />
</parameter>
</input>
<output>
@@ -16,13 +16,13 @@
</description>
<step id="compose" processor="3ColumnPage">
- <load parameter="title"><value>Administration</value></load>
- <load parameter="keywords"><value>slide,contelligent</value></load>
- <load parameter="description"><value>This page is the index page of
the demo project</value></load>
+ <load parameter="title"><string>Administration</string></load>
+ <load parameter="keywords"><string>slide,contelligent</string></load>
+ <load parameter="description"><string>This page is the index page of
the demo project</string></load>
<load parameter="left"><value processor="menuComposer"
result="sideMenu"/></load>
<load parameter="middle"><value store="input" key="content" /></load>
<load parameter="right"><value store="input" key="right" /></load>
- <load parameter="style"><value
processor="url">style.html</value></load>
+ <load parameter="style"><value
processor="url"><string>style.html</string></value></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +43 -42
jakarta-slide/projector/src/content/applications/admin/site/listRoles.xml
Index: listRoles.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/listRoles.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listRoles.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ listRoles.xml 4 Aug 2004 15:27:22 -0000 1.2
@@ -22,80 +22,81 @@
<load parameter="columns">
<array>
<map>
- <entry key="header"><value></value></entry>
- <entry
key="processor"><value>table/column/image</value></entry>
+ <entry key="header"><string></string></entry>
+ <entry
key="processor"><string>table/column/image</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value
processor="image"
result="url">/projector/applications/admin/images/role.gif</value></entry>
- <entry
key="style"><value>width: 24px;</value></entry>
+ <entry key="src"><value
processor="image"
result="url"><string>/projector/applications/admin/images/role.gif</string></value></entry>
+ <entry
key="style"><string>width: 24px;</string></entry>
</map>
</entry>
- <entry
key="replaceColumn"><value>true</value></entry>
- <entry
key="result"><value>output</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>false</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry
key="replaceColumn"><string>true</string></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>false</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
</map>
<map>
- <entry key="header"><value
processor="message">role</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>true</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry key="header"><value
processor="message"><string>role</string></value></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>true</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
</map>
<map>
- <entry key="header"><value
processor="message">creationDate</value></entry>
- <entry
key="processor"><value>dateFormatter</value></entry>
+ <entry key="header"><value
processor="message"><string>creationDate</string></value></entry>
+ <entry
key="processor"><string>dateFormatter</string></entry>
<entry key="parameters">
<map>
- <entry
key="timeFormat"><value>short</value></entry>
- <entry
key="dateFormat"><value>full</value></entry>
+ <entry
key="timeFormat"><string>short</string></entry>
+ <entry
key="dateFormat"><string>full</string></entry>
</map>
</entry>
- <entry
key="result"><value>output</value></entry>
- <entry key="name"><value>date</value></entry>
- <entry
key="key"><value>creationdate</value></entry>
- <entry
key="sortable"><value>true</value></entry>
- <entry
key="resizable"><value>true</value></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry key="name"><string>date</string></entry>
+ <entry
key="key"><string>creationdate</string></entry>
+ <entry
key="sortable"><string>true</string></entry>
+ <entry
key="resizable"><string>true</string></entry>
</map>
<map>
- <entry key="header"><value></value></entry>
- <entry
key="processor"><value>admin/table/column/trigger</value></entry>
+ <entry key="header"><string></string></entry>
+ <entry
key="processor"><string>admin/table/column/trigger</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value
processor="image"
result="url">/projector/applications/admin/images/delete-user.png</value></entry>
- <entry key="target"><value
processor="url">admin/deleteRole</value></entry>
- <entry
key="style"><value>width: 24px;</value></entry>
+ <entry key="src"><value
processor="image"
result="url"><string>/projector/applications/admin/images/delete-user.png</string></value></entry>
+ <entry key="target"><value
processor="url"><string>admin/deleteRole</string></value></entry>
+ <entry
key="style"><string>width: 24px;</string></entry>
</map>
</entry>
- <entry
key="result"><value>output</value></entry>
- <entry key="key"><value>uri</value></entry>
- <entry
key="sortable"><value>false</value></entry>
- <entry
key="resizable"><value>false</value></entry>
+ <entry
key="result"><string>output</string></entry>
+ <entry key="key"><string>uri</string></entry>
+ <entry
key="sortable"><string>false</string></entry>
+ <entry
key="resizable"><string>false</string></entry>
+ <entry
key="replaceColumn"><string>true</string></entry>
</map>
</array>
</load>
<load parameter="input"><value key="roles" /></load>
- <load parameter="offset"><value>0</value></load>
- <load parameter="itemsPerPage"><value>4</value></load>
- <load parameter="id"><value>rolesTable</value></load>
- <load parameter="store"><value>session</value></load>
+ <load parameter="offset"><string>0</string></load>
+ <load parameter="itemsPerPage"><string>4</string></load>
+ <load parameter="id"><string>rolesTable</string></load>
+ <load parameter="store"><string>session</string></load>
<save result="output" key="roles" />
<route state="ok" step="rolesPager" />
</step>
<step id="rolesPager" processor="simplePager">
- <load parameter="showRange"><value>false</value></load>
- <load parameter="id"><value>rolesTable</value></load>
- <load parameter="store"><value>session</value></load>
- <load parameter="showRange"><value>true</value></load>
- <load parameter="range"><value>3</value></load>
+ <load parameter="showRange"><string>false</string></load>
+ <load parameter="id"><string>rolesTable</string></load>
+ <load parameter="store"><string>session</string></load>
+ <load parameter="showRange"><string>true</string></load>
+ <load parameter="range"><string>3</string></load>
<save result="output" key="pager" />
<route state="failed" step="composePage"/>
<route state="ok" step="content"/>
</step>
<step id="renderNoRoles" processor="echo">
- <load parameter="input"><value>No roles found</value></load>
+ <load parameter="input"><string>No roles found</string></load>
<save result="output" key="content" />
<route state="ok" step="compose" />
</step>
@@ -114,7 +115,7 @@
<step id="compose" processor="page">
<load parameter="content"><value key="content"/></load>
<load parameter="right"><value key="form"/></load>
- <load parameter="style"><value
processor="url">style.html</value></load>
+ <load parameter="style"><value
processor="url"><string>style.html</string></value></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/site/createRole.xml
Index: createRole.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/createRole.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createRole.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ createRole.xml 4 Aug 2004 15:27:23 -0000 1.2
@@ -14,7 +14,7 @@
<step id="compose" processor="page">
<load parameter="content"><value key="form" /></load>
- <load parameter="right"><value>Rechts</value></load>
+ <load parameter="right"><string>Rechts</string></load>
<save result="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +8 -8
jakarta-slide/projector/src/content/applications/core/site/exception.xml
Index: exception.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/core/site/exception.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exception.xml 22 Jul 2004 12:18:39 -0000 1.1
+++ exception.xml 4 Aug 2004 15:27:24 -0000 1.2
@@ -3,7 +3,7 @@
<description>
<input>
<parameter name="exception" required="true">
- <resource />
+ <value />
</parameter>
</input>
<output>
@@ -16,19 +16,19 @@
<load parameter="input">
<array>
<map>
- <entry
key="header"><value>Class</value></entry>
+ <entry
key="header"><string>Class</string></entry>
<entry key="text"><value processor="exception"
result="class" store="input" key="exception"/></entry>
</map>
<map>
- <entry
key="header"><value>Title</value></entry>
+ <entry
key="header"><string>Title</string></entry>
<entry key="text"><value processor="exception"
result="title" store="input" key="exception"/></entry>
</map>
<map>
- <entry
key="header"><value>Details</value></entry>
+ <entry
key="header"><string>Details</string></entry>
<entry key="text"><value processor="exception"
result="details" store="input" key="exception"/></entry>
</map>
<map>
- <entry key="header"><value>Stack
trace</value></entry>
+ <entry key="header"><string>Stack
trace</string></entry>
<entry key="text"><value processor="exception"
result="stackTrace" store="input" key="exception"/></entry>
</map>
</array>
@@ -38,10 +38,10 @@
</step>
<step id="compose" processor="3ColumnPage">
- <load parameter="title"><value>Exception occured!</value></load>
- <load parameter="left"><value></value></load>
+ <load parameter="title"><string>Exception occured!</string></load>
+ <load parameter="left"><string></string></load>
<load parameter="middle"><value store="context"
key="renderedException" /></load>
- <load parameter="right"><value>right</value></load>
+ <load parameter="right"><string>right</string></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +9 -9
jakarta-slide/projector/src/content/applications/core/templates/page/3Columns.xml
Index: 3Columns.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/core/templates/page/3Columns.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3Columns.xml 22 Jul 2004 12:18:39 -0000 1.1
+++ 3Columns.xml 4 Aug 2004 15:27:25 -0000 1.2
@@ -6,22 +6,22 @@
<string constrained="false" />
</parameter>
<parameter name="left">
- <resource>
+ <value>
<allowed-content-type>text/html</allowed-content-type>
<allowed-content-type>*</allowed-content-type>
- </resource>
+ </value>
</parameter>
<parameter name="middle">
- <resource>
+ <value>
<allowed-content-type>text/html</allowed-content-type>
<allowed-content-type>*</allowed-content-type>
- </resource>
+ </value>
</parameter>
<parameter name="right">
- <resource>
+ <value>
<allowed-content-type>text/html</allowed-content-type>
<allowed-content-type>*</allowed-content-type>
- </resource>
+ </value>
</parameter>
</input>
<output>
@@ -32,12 +32,12 @@
<step id="compose" processor="3ColumnTemplate">
<load parameter="title"><value store="input" key="title" /></load>
- <load parameter="keywords"><value>slide,projector</value></load>
- <load parameter="description"><value>This page has been generated by
slide projector</value></load>
+ <load parameter="keywords"><string>slide,projector</string></load>
+ <load parameter="description"><string>This page has been generated by
slide projector</string></load>
<load parameter="left"><value store="input" key="left" /></load>
<load parameter="middle"><value store="input" key="middle" /></load>
<load parameter="right"><value store="input" key="right" /></load>
- <load parameter="style"><value processor="url">style.css</value></load>
+ <load parameter="style"><value
processor="url"><string>style.css</string></value></load>
<save result="output" store="output" key="output" presentable="true"/>
<route state="ok" return="ok" />
</step>
1.2 +5 -5
jakarta-slide/projector/src/content/applications/core/style/style.xml
Index: style.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/core/style/style.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- style.xml 22 Jul 2004 12:18:39 -0000 1.1
+++ style.xml 4 Aug 2004 15:27:25 -0000 1.2
@@ -8,11 +8,11 @@
</description>
<step id="compose" processor="stylesheetTemplate">
- <load parameter="veryDark"><value>#553E1C </value></load>
- <load parameter="dark"><value>#AA7D39</value></load>
- <load parameter="medium"><value>#FF9900</value></load>
- <load parameter="light"><value>#FFCC80</value></load>
- <load parameter="veryLight"><value>#FFE6BF</value></load>
+ <load parameter="veryDark"><string>#553E1C </string></load>
+ <load parameter="dark"><string>#AA7D39</string></load>
+ <load parameter="medium"><string>#FF9900</string></load>
+ <load parameter="light"><string>#FFCC80</string></load>
+ <load parameter="veryLight"><string>#FFE6BF</string></load>
<save result="output" key="output" presentable="true" />
<route state="ok" return="ok" />
</step>
1.2 +16 -0
jakarta-slide/projector/src/content/applications/core/i18n/exceptions.xml
Index: exceptions.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/core/i18n/exceptions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exceptions.xml 22 Jul 2004 12:18:39 -0000 1.1
+++ exceptions.xml 4 Aug 2004 15:27:25 -0000 1.2
@@ -172,6 +172,14 @@
<entry key="details">Der Inhaltstyp {0} der zugewiesene
Resource ist nicht zugelassen. Es werden nur folgende Inhaltstypen akzeptiert:
{1}</entry>
</locale>
</message>
+ <message id="invalidStringValue">
+ <locale language="de">
+ <entry key="title">Wert nicht als Zeichenkette
verwendbar</entry>
+ <entry key="text">Der Wert {0} l��t sich nicht als
Zeichenkette verwenden</entry>
+ <entry key="summary">Der Wert {0} l��t sich nicht als
Zeichenkette verwenden</entry>
+ <entry key="details">Der Wert {0} l��t sich nicht als
Zeichenkette verwenden</entry>
+ </locale>
+ </message>
<message id="stringTooShort">
<locale language="de">
<entry key="title">Zeichenkette zu kurz</entry>
@@ -258,6 +266,14 @@
<entry key="text">Der zugewiesene Wert {0} ist nicht als Map
verwendbar.</entry>
<entry key="summary">Der zugewiesene Wert {0} ist nicht als
Map verwendbar.</entry>
<entry key="details">Der zugewiesene Wert {0} ist nicht als
Map verwendbar.</entry>
+ </locale>
+ </message>
+ <message id="noMapEntryDescriptorsFound">
+ <locale language="de">
+ <entry key="title">Beschreibung der Map-Eintr�ge fehlt!</entry>
+ <entry key="text">Beschreibung der Map-Eintr�ge fehlt!</entry>
+ <entry key="summary">Beschreibung der Map-Eintr�ge
fehlt!</entry>
+ <entry key="details">Beschreibung der Map-Eintr�ge
fehlt!</entry>
</locale>
</message>
<message id="uncastableNumberValue">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
