[Yanel-commits] rev 43882 - in public/yanel/trunk/src:
resources/user-mgmt resources/user-mgmt/htdocs
webapp/global-resource-configs
webapp/global-resource-configs/user-mgmt
webapp/src/java/org/wyona/yanel/servlet
webapp/src/java/org/wyona/yanel/servlet/menu
guillaume at wyona.com
guillaume at wyona.com
Mon Jul 27 09:48:57 CEST 2009
Author: guillaume
Date: 2009-07-27 09:48:57 +0200 (Mon, 27 Jul 2009)
New Revision: 43882
Added:
public/yanel/trunk/src/resources/user-mgmt/htdocs/
public/yanel/trunk/src/resources/user-mgmt/htdocs/create-group.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-group.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-user.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/list-groups.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user-admin.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly
public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-group_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-user_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-group_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-user_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-groups_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-users_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user-admin_yanel-rc.xml
public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user_yanel-rc.xml
Modified:
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
Log:
Put all "user-mgmt" resource-type's screens under the reserved Yanel URL space.
TODO: This is mostly a copy of old files, that have not been deleted yet.
Issue: 6897
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/create-group.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/create-group.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/create-group.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/create-group.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Create Group</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="">
+ <label for="groupID">Group ID:</label>
+ <input type="text" id="groupID" name="groupID" value="${resource.getParameterAsString('groupID')}"/>
+ <br/>
+ Name: <input type="text" name="name" value="${resource.getParameterAsString('name')}"/>
+ <br/>
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/create-group.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/create-user.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Create User</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="">
+ <label for="userID">User ID:</label>
+ <input type="text" id="userID" name="userID" value="${resource.getParameterAsString('userID')}"/>
+ <br/>
+ Name: <input type="text" name="name" value="${resource.getParameterAsString('name')}"/>
+ <br/>
+ Email: <input type="text" name="email" value="${resource.getParameterAsString('email')}"/>
+ <br/>
+ Password: <input type="password" name="password1"/>
+ <br/>
+ Password: <input type="password" name="password2"/>
+ <br/>
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/create-user.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-group.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/delete-group.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-group.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-group.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Delete Group: ${resource.getParameterAsString('groupID')}</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="" >
+ <input type="hidden" name="groupID" value="${resource.getParameterAsString('groupID')}"/>
+ <p style="width: 500px; text-align: left">Are you sure you want to permanently delete the group ${resource.getParameterAsString('groupID')} (${resource.getGroup().getName()})?</p>
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-group.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-user.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/delete-user.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-user.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-user.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Delete User: ${resource.getParameterAsString('userID')}</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="" >
+ <input type="hidden" name="userID" value="${resource.getParameterAsString('userID')}"/>
+ <p style="width: 500px; text-align: left">Are you sure you want to permanently delete the user ${resource.getParameterAsString('userID')} (${resource.getUser().getName()})?</p>
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/delete-user.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/list-groups.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/list-groups.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/list-groups.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/list-groups.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Groups</h1>
+ <table border="1">
+ <tr>
+ <th>ID</th>
+ <th>Name</th>
+ <th>Action</th>
+ </tr>
+ <j:forEach var="group" items="${resource.getGroups()}">
+ <tr>
+ <td>${group.getID()}</td>
+ <td>${group.getName()}</td>
+ <td><a href="delete-group.html?groupID=${group.getID()}">Delete</a></td>
+ </tr>
+ </j:forEach>
+ </table>
+ <a href="create-group.html">Create new group</a>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/list-groups.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/list-users.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Users</h1>
+ <table border="1">
+ <tr>
+ <th>ID</th>
+ <th>Name</th>
+ <th>Email</th>
+ <th colspan="3">Actions</th>
+ </tr>
+ <j:forEach var="user" items="${resource.getUsers()}">
+ <tr>
+ <td>${user.getID()}</td>
+ <td>${user.getName()}</td>
+ <td>${user.getEmail()}</td>
+ <td><a href="update-user.html?userID=${user.getID()}">Edit</a></td>
+ <td><a href="update-user-admin.html?userID=${user.getID()}">Admin</a></td>
+ <td><a href="delete-user.html?userID=${user.getID()}">Delete</a></td>
+ </tr>
+ </j:forEach>
+ </table>
+ <a href="create-user.html">Create new user</a>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/list-users.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user-admin.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/update-user-admin.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user-admin.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user-admin.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Update User: ${resource.getParameterAsString('userID')}</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="" >
+ <input type="hidden" name="userID" value="${resource.getParameterAsString('userID')}"/>
+ <input type="hidden" name="usecaseState" value="${resource.getParameterAsString('usecaseState')}"/>
+ Name: <input type="text" name="name" value="${resource.getParameterAsString('name')}"/>
+ <br/>
+ Email: <input type="text" name="email" value="${resource.getParameterAsString('email')}"/>
+ <br/>
+ New Password: <input type="password" name="password1"/>
+ <br/>
+ New Password: <input type="password" name="password2"/>
+ <br/>
+
+ Group Affiliation:
+ <table border="1">
+ <j:forEach var="group" items="${resource.getGroups()}">
+ <tr>
+ <td>${group.getName()}</td>
+ <td>
+ <j:choose>
+ <j:when test="${resource.isGroupSelected(group)}">
+ <input type="checkbox" checked="checked" name="groups" value="${group.getID()}"/>
+ </j:when>
+ <j:otherwise>
+ <input type="checkbox" name="groups" value="${group.getID()}"/>
+ </j:otherwise>
+ </j:choose>
+ </td>
+ </tr>
+ </j:forEach>
+ </table>
+
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user-admin.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/update-user.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Update User: ${resource.getParameterAsString('userID')}</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <form action="" >
+ <input type="hidden" name="userID" value="${resource.getParameterAsString('userID')}"/>
+ <input type="hidden" name="usecaseState" value="${resource.getParameterAsString('usecaseState')}"/>
+ Name: <input type="text" name="name" value="${resource.getParameterAsString('name')}"/>
+ <br/>
+ Email: <input type="text" name="email" value="${resource.getParameterAsString('email')}"/>
+ <br/>
+ Current Password: <input type="password" name="oldPassword"/>
+ <br/>
+ New Password: <input type="password" name="password1"/>
+ <br/>
+ New Password: <input type="password" name="password2"/>
+ <br/>
+
+ Group Affiliation:
+ <table border="1">
+ <j:forEach var="group" items="${resource.getGroups()}">
+ <tr>
+ <td>${group.getName()}</td>
+ <td>
+ <j:choose>
+ <j:when test="${resource.isGroupSelected(group)}">
+ <input disabled="disabled" type="checkbox" checked="checked" name="groups" value="${group.getID()}"/>
+ </j:when>
+ <j:otherwise>
+ <input disabled="disabled" type="checkbox" name="groups" value="${group.getID()}"/>
+ </j:otherwise>
+ </j:choose>
+ </td>
+ </tr>
+ </j:forEach>
+ </table>
+
+ <input type="submit" name="submit" value="Ok"/>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </form>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/update-user.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/usecase-cancel.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Usecase cancelled</h1>
+ <a href="list-users.html">Show list of users</a>
+ <br/>
+ <a href="list-groups.html">Show list of groups</a>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-cancel.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly (from rev 43801, public/yanel/trunk/src/realms/yanel-website/content/usecases/user-mgmt/templates/usecase-done.jelly)
===================================================================
--- public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly (rev 0)
+++ public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<j:jelly xmlns:j="jelly:core">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1>Usecase done</h1>
+ <p>${resource.getErrorMessages()}</p>
+ <p>${resource.getInfoMessages()}</p>
+
+ <a href="list-users.html">Show list of users</a>
+ <br/>
+ <a href="list-groups.html">Show list of groups</a>
+ </body>
+ </html>
+</j:jelly>
Property changes on: public/yanel/trunk/src/resources/user-mgmt/htdocs/usecase-done.jelly
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-group_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/create-group.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-group_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-group_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="create-group" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/create-group.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-group_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-user_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/create-user.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-user_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-user_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="create-user" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/create-user.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/create-user_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-group_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/delete-group.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-group_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-group_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="delete-group" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/delete-group.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-group_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-user_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/delete-user.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-user_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-user_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="delete-user" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/delete-user.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/delete-user_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-groups_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/list-groups.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-groups_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-groups_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="list-groups" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/list-groups.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-groups_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-users_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/list-users.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-users_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-users_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="list-users" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/list-users.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/list-users_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user-admin_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/update-user-admin.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user-admin_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user-admin_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="update-user" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+ <yanel:property name="allowEditGroups" value="true"/>
+ <yanel:property name="verifyPassword" value="false"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/update-user-admin.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user-admin_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user_yanel-rc.xml (from rev 43801, public/yanel/trunk/src/realms/yanel-website/res-configs-repo/data/usecases/user-mgmt/update-user.html.yanel-rc)
===================================================================
--- public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user_yanel-rc.xml (rev 0)
+++ public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user_yanel-rc.xml 2009-07-27 07:48:57 UTC (rev 43882)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<yanel:resource-config xmlns:yanel="http://www.wyona.org/yanel/rti/1.0">
+ <yanel:rti name="update-user" namespace="http://www.wyona.org/yanel/resource/1.0"/>
+
+ <yanel:property name="xslt" value="/xslt/usecase.xsl"/>
+ <yanel:property name="allowEditGroups" value="false"/>
+ <yanel:property name="verifyPassword" value="true"/>
+
+ <yanel:custom-config>
+ <views>
+ <view id="default" type="jelly">
+ <template>rthtdocs:/update-user.jelly</template>
+ </view>
+ <view id="done" type="jelly">
+ <template>rthtdocs:/usecase-done.jelly</template>
+ </view>
+ <view id="cancel" type="jelly">
+ <template>rthtdocs:/usecase-cancel.jelly</template>
+ </view>
+ </views>
+ </yanel:custom-config>
+
+</yanel:resource-config>
Property changes on: public/yanel/trunk/src/webapp/global-resource-configs/user-mgmt/update-user_yanel-rc.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2009-07-26 21:27:27 UTC (rev 43881)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2009-07-27 07:48:57 UTC (rev 43882)
@@ -130,8 +130,6 @@
private static final String CONTENT_TYPE_XHTML = "xhtml";
- public static final String DATA_REPOSITORY_SITETREE_HTML = "data-repository-sitetree.html";
-
@Override
public void init(ServletConfig config) throws ServletException {
servletContextRealPath = config.getServletContext().getRealPath("/");
@@ -1697,29 +1695,29 @@
HttpServletRequest request = environment.getRequest();
java.util.Map<String, String> properties = new HashMap<String, String>();
- final String usersPathPrefix = pathPrefix + "users/";
- final String userListPagePath = pathPrefix + "user-mgmt/list-users.html";
- final String dataRepoSitetreePagePath = pathPrefix + DATA_REPOSITORY_SITETREE_HTML;
+ //XXX: maybe we should use a configuration file instead!
+ java.util.Map<String, String> globalRCmap = new HashMap<String, String>();
+ globalRCmap.put("data-repository-sitetree.html", "data-repo-sitetree_yanel-rc.xml");
+ final String admin = "admin/";
+ globalRCmap.put(admin + "list-groups.html", "user-mgmt/list-groups_yanel-rc.xml");
+ globalRCmap.put(admin + "list-users.html", "user-mgmt/list-users_yanel-rc.xml");
+ globalRCmap.put(admin + "delete-group.html", "user-mgmt/delete-group_yanel-rc.xml");
+ globalRCmap.put(admin + "create-group.html", "user-mgmt/create-group_yanel-rc.xml");
+ globalRCmap.put(admin + "delete-user.html", "user-mgmt/delete-user_yanel-rc.xml");
+ globalRCmap.put(admin + "update-user.html", "user-mgmt/update-user_yanel-rc.xml");
+ globalRCmap.put(admin + "create-user.html", "user-mgmt/create-user_yanel-rc.xml");
+ globalRCmap.put(admin + "update-user-admin.html", "user-mgmt/update-user-admin_yanel-rc.xml");
+ String pathSuffix = path.substring(pathPrefix.length());
+ String globalRCfilename = globalRCmap.get(pathSuffix);
+
+ final String usersPathPrefix = pathPrefix + "users/";
if (path.startsWith(usersPathPrefix)) {
final String userName = path.substring(usersPathPrefix.length(), path.length() - ".html".length());
properties.put("user", userName);
return new ResourceConfiguration("yanel-user", "http://www.wyona.org/yanel/resource/1.0", properties);
- } else if (path.equals(userListPagePath)) {
- log.warn("TODO: Implementation not finished yet!");
- return null;
- /*
- } else if (path.equals(groupsPathPrefix)) {
- final String groupName = path.substring(groupsPathPrefix.length(), path.length());
- if (groupName.equals("")) {
- ResourceConfiguration rc = new ResourceConfiguration("yanel-user", "http://www.wyona.org/yanel/resource/1.0", properties);
- }
- log.warn("TODO: Implementation not finished yet!");
- properties.put("user", userName);
- return new ResourceConfiguration("yanel-user", "http://www.wyona.org/yanel/resource/1.0", properties);
- */
- } else if (path.equals(dataRepoSitetreePagePath)) {
- return getGlobalResourceConfiguration("data-repo-sitetree_yanel-rc.xml", getRealm(request));
+ } else if (globalRCfilename != null) {
+ return getGlobalResourceConfiguration(globalRCfilename, getRealm(request));
}
return null;
}
Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java 2009-07-26 21:27:27 UTC (rev 43881)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java 2009-07-27 07:48:57 UTC (rev 43882)
@@ -42,7 +42,7 @@
sb.append("<div id=\"yaneltoolbar_menutitle\">Yanel</div><ul>");
// View page info moved to getFileMenu() of default implementation
//sb.append("<li><a href=\"?yanel.resource.meta\">View page info</a></li>");
- sb.append("<li><a href=\"" + backToRealm + reservedPrefix + "/" + YanelServlet.DATA_REPOSITORY_SITETREE_HTML + "\">Browse Data Repository Sitetree</a></li>");
+ sb.append("<li><a href=\"" + backToRealm + reservedPrefix + "/data-repository-sitetree.html\">Browse Data Repository Sitetree</a></li>");
sb.append("<li class=\"haschild\">Page");
sb.append("<ul>");
sb.append("<li><a href=\"?yanel.resource.meta\">Info</a></li>");
More information about the Yanel-commits
mailing list