You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/09/30 21:26:17 UTC
cvs commit: jakarta-slide/projector/src/content/applications/admin/site index.xml editUser.xml listUsers.xml createUser.xml page.xml listRoles.xml createRole.xml
dflorey 2004/09/30 12:26:17
Modified: projector/src/content/applications/admin/jobs
menuComposer.xml listUsers.xml updateUsers.xml
listRoles.xml updateRoles.xml
projector/src/content/applications/admin/security
removeRole.xml login.xml createRole.xml addRole.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
Added: projector/src/content/applications/admin/images
user-small.gif user_role-remove.gif
user_role2-remove.gif user_role-add.gif
user-remove2.gif user-sibling.gif
user_role2-add.gif user-change.gif user-remove.gif
Log:
Changes on projector application to make them work with projector 0.2
Revision Changes Path
1.1 jakarta-slide/projector/src/content/applications/admin/images/user-small.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user_role-remove.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user_role2-remove.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user_role-add.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user-remove2.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user-sibling.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user_role2-add.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user-change.gif
<<Binary file>>
1.1 jakarta-slide/projector/src/content/applications/admin/images/user-remove.gif
<<Binary file>>
1.2 +15 -6 jakarta-slide/projector/src/content/applications/admin/jobs/menuComposer.xml
Index: menuComposer.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/jobs/menuComposer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuComposer.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ menuComposer.xml 30 Sep 2004 19:26:16 -0000 1.2
@@ -2,15 +2,23 @@
<process first-step="localize">
<description>
<output>
- <state>ok</state>
- <result name="sideMenu" description="admin/sideMenu" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="sideMenu" description="admin/sideMenu">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="localize" processor="treeLocalizer">
<load parameter="input"><value processor="sitemap" result="output" /></load>
- <save result="output" key="localizedSitemap" />
- <route state="ok" step="sideMenu" />
+ <route state="ok" step="sideMenu">
+ <save result="output" key="localizedSitemap" />
+ </route>
</step>
<step id="sideMenu" processor="sideMenu">
@@ -20,7 +28,8 @@
<load parameter="input">
<value key="localizedSitemap" />
</load>
- <save result="output" store="output" key="sideMenu" />
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="sideMenu" />
+ </route>
</step>
</process>
1.3 +24 -11 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listUsers.xml 4 Aug 2004 15:27:21 -0000 1.2
+++ listUsers.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -2,28 +2,41 @@
<process first-step="checkForCachedUsers">
<description>
<output>
- <state>usersAvailable</state>
- <state>noUsersAvailable</state>
- <result name="output" description="listedUsers" content-type="application/x-java-array" presentable="true" />
+ <state name="usersAvailable">
+ <result name="output" description="listedUsers">
+ <constraints>
+ <array />
+ </constraints>
+ </result>
+ </state>
+ <state name="noUsersAvailable"/>
</output>
- </description>
+ </description>
<step id="checkForCachedUsers" processor="exists">
- <load parameter="input"><value store="cache" key="users"/></load>
+ <load parameter="input">
+ <value store="cache" key="users"/>
+ </load>
<route state="true" step="usersCached"/>
<route state="false" step="queryUsers"/>
</step>
<step id="usersCached" processor="echo">
- <load parameter="input"><value store="cache" key="users" /></load>
- <save result="output" store="output" key="output" />
- <route state="ok" return="usersAvailable"/>
+ <load parameter="input">
+ <value store="cache" key="users" />
+ </load>
+ <route state="ok" return="usersAvailable">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
<step id="queryUsers" processor="DASLQuery">
- <load parameter="query"><value store="repository" key="/projector/applications/admin/query/userQuery.xml" /></load>
- <save result="output" store="cache" key="users" />
- <route state="ok" step="usersCached" />
+ <load parameter="query">
+ <value store="repository" key="/projector/applications/admin/query/userQuery.xml" />
+ </load>
+ <route state="ok" step="usersCached">
+ <save result="output" store="cache" key="users" />
+ </route>
<route state="empty" return="noUsersAvailable" />
</step>
</process>
1.3 +19 -11 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- updateUsers.xml 4 Aug 2004 15:27:21 -0000 1.2
+++ updateUsers.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -1,22 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<process first-step="disposeUsers">
- <description>
+ <description>
<input>
<parameter name="store">
- <string>
- <allowed-value default="true">cache</allowed-value>
- <allowed-value>session</allowed-value>
- <allowed-value>repository</allowed-value>
- </string>
+ <constraints>
+ <string>
+ <allowed-value>cache</allowed-value>
+ <allowed-value>session</allowed-value>
+ <allowed-value>repository</allowed-value>
+ </string>
+ </constraints>
+ <default>
+ <string>cache</string>
+ </default>
</parameter>
<parameter name="key">
- <string constrained="false" />
+ <constraints>
+ <string />
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
+ <state name="ok"/>
</output>
- </description>
+ </description>
<step id="disposeUsers" processor="dispose">
<load parameter="store"><string>cache</string></load>
@@ -25,8 +32,9 @@
</step>
<step id="listUsers" processor="usersQuery">
- <save result="output" store="cache" key="users" />
- <route state="usersAvailable" return="ok" />
+ <route state="usersAvailable" return="ok">
+ <save result="output" store="cache" key="users" />
+ </route>
<route state="noUsersAvailable" return="ok" />
</step>
</process>
1.3 +14 -7 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listRoles.xml 4 Aug 2004 15:27:21 -0000 1.2
+++ listRoles.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -2,9 +2,14 @@
<process first-step="checkForCachedRoles">
<description>
<output>
- <state>rolesAvailable</state>
- <state>noRolesAvailable</state>
- <result name="output" description="listedRoles" content-type="application/x-java-array" presentable="true" />
+ <state name="rolesAvailable">
+ <result name="output" description="listedRoles">
+ <constraints>
+ <array/>
+ </constraints>
+ </result>
+ </state>
+ <state name="noRolesAvailable"/>
</output>
</description>
@@ -16,14 +21,16 @@
<step id="rolesCached" processor="echo">
<load parameter="input"><value store="cache" key="roles" /></load>
- <save result="output" store="output" key="output" />
- <route state="ok" return="rolesAvailable"/>
+ <route state="ok" return="rolesAvailable">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
<step id="queryRoles" processor="DASLQuery">
<load parameter="query"><value store="repository" key="/projector/applications/admin/query/rolesQuery.xml" /></load>
- <save result="output" store="cache" key="roles" />
- <route state="ok" step="rolesCached" />
+ <route state="ok" step="rolesCached">
+ <save result="output" store="cache" key="roles" />
+ </route>
<route state="empty" return="noRolesAvailable" />
</step>
</process>
1.3 +14 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- updateRoles.xml 4 Aug 2004 15:27:21 -0000 1.2
+++ updateRoles.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -3,18 +3,22 @@
<description>
<input>
<parameter name="store">
- <string>
- <allowed-value default="true">cache</allowed-value>
- <allowed-value>session</allowed-value>
- <allowed-value>repository</allowed-value>
- </string>
+ <constraints>
+ <string>
+ <allowed-value default="true">cache</allowed-value>
+ <allowed-value>session</allowed-value>
+ <allowed-value>repository</allowed-value>
+ </string>
+ </constraints>
</parameter>
<parameter name="key">
- <string constrained="false" />
+ <constraints>
+ <string constrained="false" />
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
+ <state name="ok"/>
</output>
</description>
@@ -25,8 +29,9 @@
</step>
<step id="listRoles" processor="rolesQuery">
- <save result="output" store="cache" key="roles" />
- <route state="rolesAvailable" return="ok" />
+ <route state="rolesAvailable" return="ok">
+ <save result="output" store="cache" key="roles" />
+ </route>
<route state="noRolesAvailable" return="ok" />
</step>
</process>
1.2 +19 -7 jakarta-slide/projector/src/content/applications/admin/security/removeRole.xml
Index: removeRole.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/security/removeRole.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- removeRole.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ removeRole.xml 30 Sep 2004 19:26:16 -0000 1.2
@@ -3,17 +3,28 @@
<description>
<input>
<parameter name="user">
- <uri />
+ <constraints>
+ <uri />
+ </constraints>
</parameter>
<parameter name="role">
- <uri />
+ <constraints>
+ <uri />
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
- </description>
+ </description>
<step id="removeRole" processor="removeRole">
<load parameter="user"><value store="input" key="user" /></load>
@@ -23,7 +34,8 @@
<step id="page" processor="editUser.html">
<load parameter="uri"><value store="input" key="user" /></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok"/>
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.5 +137 -41 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- login.xml 11 Aug 2004 13:12:56 -0000 1.4
+++ login.xml 30 Sep 2004 19:26:16 -0000 1.5
@@ -2,10 +2,35 @@
<process first-step="authenticated">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/plain" presentable="true" />
+ <state name="default">
+ <result name="output" description="composedForm">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
+ <state name="valid">
+ <result name="output" description="composedForm">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
+ <state name="invalid">
+ <result name="output" description="composedForm">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
- </description>
+ </description>
<step id="authenticated" processor="authenticated">
<route state="false" step="loginForm"/>
@@ -13,75 +38,146 @@
</step>
<step id="loginForm" processor="loginForm">
- <load parameter="action"><string>login</string></load>
- <load parameter="errorsProcessor"><string>errors</string></load>
- <load parameter="title"><string>Login:</string></load>
+ <load parameter="action">
+ <string>login</string>
+ </load>
+ <load parameter="errorsProcessor">
+ <string>errors</string>
+ </load>
+ <load parameter="title">
+ <string>Login:</string>
+ </load>
<load parameter="control:loginfield">
<map>
- <entry key="parameter"><string>username</string></entry>
- <entry key="control"><string>textfield</string></entry>
- <entry key="controlContainer"><string>verticalControl</string></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"><string>password</string></entry>
- <entry key="control"><string>passwordfield</string></entry>
- <entry key="controlContainer"><string>verticalControl</string></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"><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>/projector/applications/admin/images/button_cancel.png</string></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>/projector/applications/admin/images/button_cancel.png</string>
+ </value>
+ </entry>
</map>
</load>
<load parameter="trigger:login">
<map>
- <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>/projector/applications/admin/images/button_ok.png</string></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>/projector/applications/admin/images/button_ok.png</string>
+ </value>
+ </entry>
</map>
</load>
- <save result="output" store="output" key="output" />
- <route state="invalid" return="ok"/>
- <route state="valid" return="ok"/>
- <route state="default" return="ok"/>
+ <route state="invalid" return="invalid">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="valid" return="valid">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="default" return="default">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
-
+
<step id="login" processor="login">
- <load parameter="username"><value store="form" key="username"/></load>
- <load parameter="password"><value store="form" key="password"/></load>
+ <load parameter="username">
+ <value store="form" key="username"/>
+ </load>
+ <load parameter="password">
+ <value store="form" key="password"/>
+ </load>
<route state="loginOk" step="clearForm"/>
<route state="loginFailed" step="loginForm"/>
</step>
-
+
<step id="clearForm" processor="clearForm">
<route state="ok" step="logoutForm"/>
</step>
<step id="logoutForm" processor="logoutForm">
- <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="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"><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>
+ <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>/projector/applications/admin/images/button_ok.png</string>
+ </value>
+ </entry>
</map>
</load>
- <save result="output" store="output" key="output" />
- <route state="invalid" return="ok"/>
- <route state="valid" return="ok"/>
- <route state="default" return="ok"/>
+ <route state="invalid" return="invalid">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="valid" return="valid">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="default" return="default">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
-
+
<step id="logout" processor="logout">
<route state="ok" step="loginForm"/>
</step>
1.5 +55 -18 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- createRole.xml 11 Aug 2004 13:12:56 -0000 1.4
+++ createRole.xml 30 Sep 2004 19:26:16 -0000 1.5
@@ -2,40 +2,77 @@
<process first-step="form">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedForm" content-type="text/plain" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedForm">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="form" processor="createRoleForm">
- <load parameter="action"><string>createRole</string></load>
- <load parameter="errorsProcessor"><string>errors</string></load>
- <load parameter="title"><value processor="message"><string>createRole</string></value></load>
+ <load parameter="action">
+ <string>createRole</string>
+ </load>
+ <load parameter="errorsProcessor">
+ <string>errors</string>
+ </load>
+ <load parameter="title">
+ <value processor="message">
+ <string>createRole</string>
+ </value>
+ </load>
<load parameter="control:rolename">
<map>
- <entry key="parameter"><string>rolename</string></entry>
- <entry key="control"><string>textfield</string></entry>
- <entry key="controlContainer"><string>verticalControl</string></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"><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>/projector/applications/admin/images/button_ok.png</string></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>/projector/applications/admin/images/button_ok.png</string>
+ </value>
+ </entry>
</map>
</load>
- <save result="output" store="output" key="output" />
- <route state="invalid" return="ok"/>
- <route state="valid" return="ok"/>
- <route state="default" return="ok"/>
+ <route state="invalid" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="valid" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="default" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
<step id="create" processor="createRole">
<load parameter="rolename"><value store="form" key="rolename"/></load>
- <save result="role" key="role" />
- <route state="ok" step="disposeRoles" />
+ <route state="ok" step="disposeRoles">
+ <save result="role" key="role" />
+ </route>
<route state="failed" step="form"/>
</step>
1.2 +18 -6 jakarta-slide/projector/src/content/applications/admin/security/addRole.xml
Index: addRole.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/content/applications/admin/security/addRole.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addRole.xml 22 Jul 2004 12:18:38 -0000 1.1
+++ addRole.xml 30 Sep 2004 19:26:16 -0000 1.2
@@ -3,15 +3,26 @@
<description>
<input>
<parameter name="user">
- <uri />
+ <constraints>
+ <uri />
+ </constraints>
</parameter>
<parameter name="role">
- <uri />
+ <constraints>
+ <uri />
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
@@ -23,7 +34,8 @@
<step id="page" processor="editUser.html">
<load parameter="uri"><value store="input" key="user" /></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok"/>
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.5 +23 -10 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- createUser.xml 11 Aug 2004 13:12:56 -0000 1.4
+++ createUser.xml 30 Sep 2004 19:26:16 -0000 1.5
@@ -2,8 +2,15 @@
<process first-step="form">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/plain" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
@@ -40,19 +47,25 @@
<entry key="image"><value processor="image" result="url"><string>/projector/applications/admin/images/button_ok.png</string></value></entry>
</map>
</load>
- <save result="output" store="output" key="output" />
- <route state="invalid" return="ok"/>
- <route state="valid" return="ok"/>
- <route state="default" return="ok"/>
+ <route state="invalid" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="valid" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
+ <route state="default" return="ok">
+ <save result="output" store="output" key="output" />
+ </route>
</step>
<step id="create" processor="createUser">
<load parameter="username"><value store="form" key="username"/></load>
<load parameter="password"><value store="form" key="password"/></load>
<load parameter="retypePassword"><value store="form" key="retypePassword"/></load>
- <save result="user" key="user" />
- <route state="ok" step="addRole" />
- <route state="failed" step="form"/>
+ <route state="ok" step="addRole">
+ <save result="user" key="user" />
+ </route>
+ <route state="failed" step="form"/>
</step>
<step id="addRole" processor="addRole">
@@ -72,7 +85,7 @@
</step>
<step id="success" processor="bookmark">
- <load parameter="bookmark"><string>listUsers.html</string></load>
+ <load parameter="bookmark"><uri>listUsers.html</uri></load>
<route state="ok" return="ok" />
</step>
</process>
1.3 +15 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deleteUser.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ deleteUser.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -3,12 +3,21 @@
<description>
<input>
<parameter name="uri">
- <string constrained="false" />
+ <constraints>
+ <uri/>
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
@@ -24,7 +33,8 @@
</step>
<step id="page" processor="listUsers.html">
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok"/>
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +15 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deleteRole.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ deleteRole.xml 30 Sep 2004 19:26:16 -0000 1.3
@@ -3,12 +3,21 @@
<description>
<input>
<parameter name="uri">
- <string constrained="false" />
+ <constraints>
+ <uri/>
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
@@ -24,7 +33,8 @@
</step>
<step id="page" processor="listRoles.html">
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok"/>
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +12 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ index.xml 30 Sep 2004 19:26:17 -0000 1.3
@@ -2,15 +2,23 @@
<process first-step="compose">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="compose" processor="page">
<load parameter="content"><value processor="menuComposer" result="sideMenu"/></load>
<load parameter="right"><string>Rechts</string></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.4 +39 -21 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- editUser.xml 11 Aug 2004 13:12:45 -0000 1.3
+++ editUser.xml 30 Sep 2004 19:26:17 -0000 1.4
@@ -3,26 +3,37 @@
<description>
<input>
<parameter name="uri">
- <string constrained="false" />
+ <constraints>
+ <uri/>
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="userInfo" processor="propertyQuery">
<load parameter="uri"><value store="input" key="uri"/></load>
- <save result="map" key="properties"/>
- <route state="ok" step="membership" />
+ <route state="ok" step="membership">
+ <save result="map" key="properties"/>
+ </route>
<route state="empty" step="membership" />
</step>
<step id="membership" processor="listRoles">
<load parameter="user"><value store="input" key="uri" /></load>
- <save result="roles" key="roles" />
- <route state="ok" step="renderMembership"/>
+ <route state="ok" step="renderMembership">
+ <save result="roles" key="roles" />
+ </route>
</step>
<step id="renderMembership" processor="membershipTable">
@@ -37,8 +48,9 @@
<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" />
+ <route state="ok" step="membershipPager">
+ <save result="output" key="membership" />
+ </route>
</step>
<step id="membershipPager" processor="simplePager">
@@ -52,15 +64,17 @@
<entry key="uri"><value store="input" key="uri"/></entry>
</map>
</load>
- <save result="output" key="membershipPager" />
<route state="failed" step="roles" />
- <route state="ok" step="queryRoles" />
+ <route state="ok" step="queryRoles">
+ <save result="output" key="membershipPager" />
+ </route>
</step>
<step id="queryRoles" processor="DASLQuery">
<load parameter="query"><value store="repository" key="/projector/applications/admin/query/rolesQuery.xml" /></load>
- <save result="output" key="roles" />
- <route state="ok" step="renderRoles" />
+ <route state="ok" step="renderRoles">
+ <save result="output" key="roles" />
+ </route>
<route state="empty" return="renderNoRoles" />
</step>
@@ -75,8 +89,9 @@
<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" />
+ <route state="ok" step="rolesPager">
+ <save result="output" key="roles" />
+ </route>
</step>
<step id="rolesPager" processor="simplePager">
@@ -90,9 +105,10 @@
<entry key="uri"><value store="input" key="uri"/></entry>
</map>
</load>
- <save result="output" key="rolesPager" />
<route state="failed" step="compose"/>
- <route state="ok" step="content"/>
+ <route state="ok" step="content">
+ <save result="output" key="rolesPager" />
+ </route>
</step>
<step id="content" processor="editUser">
@@ -101,14 +117,16 @@
<load parameter="membershipPager"><value key="membershipPager"/></load>
<load parameter="roles"><value key="roles"/></load>
<load parameter="rolesPager"><value key="rolesPager"/></load>
- <save result="output" key="content" />
- <route state="ok" step="compose"/>
+ <route state="ok" step="compose">
+ <save result="output" key="content" />
+ </route>
</step>
<step id="compose" processor="page">
<load parameter="content"><value key="content" /></load>
<load parameter="right"><string>Rechts</string></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.5 +36 -16 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- listUsers.xml 11 Aug 2004 13:12:45 -0000 1.4
+++ listUsers.xml 30 Sep 2004 19:26:17 -0000 1.5
@@ -2,19 +2,34 @@
<process first-step="login">
<description>
<output>
- <state>ok</state>
- <result name="output" description="loginPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="login" processor="admin/login">
- <save result="output" key="form" />
- <route state="ok" step="queryUser"/>
+ <route state="valid" step="queryUser">
+ <save result="output" key="form" />
+ </route>
+ <route state="invalid" step="queryUser">
+ <save result="output" key="form" />
+ </route>
+ <route state="default" step="queryUser">
+ <save result="output" key="form" />
+ </route>
</step>
<step id="queryUser" processor="usersQuery">
- <save result="output" key="users" />
- <route state="usersAvailable" step="renderUser" />
+ <route state="usersAvailable" step="renderUser">
+ <save result="output" key="users" />
+ </route>
<route state="noUsersAvailable" step="renderNoUser" />
</step>
@@ -81,8 +96,9 @@
<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" />
+ <route state="ok" step="userPager">
+ <save result="output" key="user" />
+ </route>
</step>
<step id="userPager" processor="simplePager">
@@ -91,15 +107,17 @@
<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"/>
+ <route state="ok" step="content">
+ <save result="output" key="pager" />
+ </route>
</step>
<step id="renderNoUser" processor="echo">
<load parameter="input"><string>No user found</string></load>
- <save result="output" key="content" />
- <route state="ok" step="compose" />
+ <route state="ok" step="compose">
+ <save result="output" key="content" />
+ </route>
</step>
<step id="content" processor="stringArray">
@@ -109,15 +127,17 @@
<value key="pager"/>
</array>
</load>
- <save result="output" key="content" />
- <route state="ok" step="compose" />
+ <route state="ok" step="compose">
+ <save result="output" key="content" />
+ </route>
</step>
<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"><string>style.html</string></value></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +15 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- createUser.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ createUser.xml 30 Sep 2004 19:26:17 -0000 1.3
@@ -2,20 +2,29 @@
<process first-step="registerForm">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="registerForm" processor="admin/createUser">
- <save result="output" key="form" />
- <route state="ok" step="compose"/>
+ <route state="ok" step="compose">
+ <save result="output" key="form" />
+ </route>
</step>
<step id="compose" processor="page">
<load parameter="content"><value key="form" /></load>
<load parameter="right"><string>Rechts</string></load>
- <save result="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +18 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ page.xml 30 Sep 2004 19:26:17 -0000 1.3
@@ -3,15 +3,26 @@
<description>
<input>
<parameter name="content">
- <value />
+ <constraints>
+ <value />
+ </constraints>
</parameter>
<parameter name="right">
- <value />
+ <constraints>
+ <value />
+ </constraints>
</parameter>
</input>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
@@ -23,7 +34,8 @@
<load parameter="middle"><value store="input" key="content" /></load>
<load parameter="right"><value store="input" key="right" /></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" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +37 -17 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listRoles.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ listRoles.xml 30 Sep 2004 19:26:17 -0000 1.3
@@ -2,19 +2,34 @@
<process first-step="login">
<description>
<output>
- <state>ok</state>
- <result name="output" description="loginPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="login" processor="admin/login">
- <save result="output" key="form" />
- <route state="ok" step="queryRoles"/>
+ <route state="default" step="queryRoles">
+ <save result="output" key="form" />
+ </route>
+ <route state="valid" step="queryRoles">
+ <save result="output" key="form" />
+ </route>
+ <route state="invalid" step="queryRoles">
+ <save result="output" key="form" />
+ </route>
</step>
<step id="queryRoles" processor="rolesQuery">
- <save result="output" key="roles" />
- <route state="rolesAvailable" step="renderRoles" />
+ <route state="rolesAvailable" step="renderRoles">
+ <save result="output" key="roles" />
+ </route>
<route state="noRolesAvailable" step="renderNoRoles" />
</step>
@@ -26,7 +41,7 @@
<entry key="processor"><string>table/column/image</string></entry>
<entry key="parameters">
<map>
- <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/role.gif</string></value></entry>
+ <entry key="src"><value processor="image" result="url"><string>/projector/applications/admin/images/user-sibling.gif</string></value></entry>
<entry key="style"><string>width: 24px;</string></entry>
</map>
</entry>
@@ -80,8 +95,9 @@
<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" />
+ <route state="ok" step="rolesPager">
+ <save result="output" key="roles" />
+ </route>
</step>
<step id="rolesPager" processor="simplePager">
@@ -90,15 +106,17 @@
<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"/>
+ <route state="ok" step="content">
+ <save result="output" key="pager" />
+ </route>
</step>
<step id="renderNoRoles" processor="echo">
<load parameter="input"><string>No roles found</string></load>
- <save result="output" key="content" />
- <route state="ok" step="compose" />
+ <route state="ok" step="compose">
+ <save result="output" key="content" />
+ </route>
</step>
<step id="content" processor="stringArray">
@@ -108,15 +126,17 @@
<value key="pager"/>
</array>
</load>
- <save result="output" key="content" />
- <route state="ok" step="compose" />
+ <route state="ok" step="compose">
+ <save result="output" key="content" />
+ </route>
</step>
<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"><string>style.html</string></value></load>
- <save result="output" store="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
1.3 +15 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- createRole.xml 4 Aug 2004 15:27:23 -0000 1.2
+++ createRole.xml 30 Sep 2004 19:26:17 -0000 1.3
@@ -2,20 +2,29 @@
<process first-step="registerForm">
<description>
<output>
- <state>ok</state>
- <result name="output" description="composedPage" content-type="text/html" presentable="true" />
+ <state name="ok">
+ <result name="output" description="composedPage">
+ <constraints>
+ <text>
+ <allowed-content-type>text/html</allowed-content-type>
+ </text>
+ </constraints>
+ </result>
+ </state>
</output>
</description>
<step id="registerForm" processor="admin/createRole">
- <save result="output" key="form" />
- <route state="ok" step="compose"/>
+ <route state="ok" step="compose">
+ <save result="output" key="form" />
+ </route>
</step>
<step id="compose" processor="page">
<load parameter="content"><value key="form" /></load>
<load parameter="right"><string>Rechts</string></load>
- <save result="output" key="output" presentable="true"/>
- <route state="ok" return="ok" />
+ <route state="ok" return="ok">
+ <save result="output" store="output" key="output"/>
+ </route>
</step>
</process>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org