[Registry-dev] svn commit r10057 - in
trunk/registry/modules/webapps: conf
src/main/java/org/wso2/registry/web/actions
src/main/webapp/admin/tiles
svn at wso2.org
svn at wso2.org
Wed Nov 21 22:08:57 PST 2007
Author: chathura
Date: Wed Nov 21 22:08:45 2007
New Revision: 10057
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
Modified:
trunk/registry/modules/webapps/conf/registry.xml
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/recent_activity.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user_management.jsp
Log:
Integrated the recent activity to the UI.
Started creating complete user/role UIs.
Modified: trunk/registry/modules/webapps/conf/registry.xml
==============================================================================
--- trunk/registry/modules/webapps/conf/registry.xml (original)
+++ trunk/registry/modules/webapps/conf/registry.xml Wed Nov 21 22:08:45 2007
@@ -37,7 +37,7 @@
<result name="error" type="tiles">searchresults.definition</result>
</action>
- <action name="RecentActivity">
+ <action name="RecentActivity" class="org.wso2.registry.web.actions.RecentActivityAction">
<result name="success" type="tiles">recentactivity.main.definition</result>
</action>
@@ -105,11 +105,11 @@
<result name="success" type="tiles">user.management.definition</result>
</action>
- <action name="UserDetail" >
+ <action name="UserDetails" class="org.wso2.registry.web.actions.UserDetailsAction">
<result name="success" type="tiles">user.detail.definition</result>
</action>
- <action name="RoleDetail" >
+ <action name="RoleDetails" >
<result name="success" type="tiles">role.detail.definition</result>
</action>
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddUserAction.java Wed Nov 21 22:08:45 2007
@@ -42,7 +42,7 @@
userManager.addUser(newUserName, password);
- if (roleName != null && !roleName.equalsIgnoreCase("-- None --")) {
+ if (roleName != null && !roleName.equalsIgnoreCase("1")) {
userManager.addUserToRole(newUserName, roleName);
}
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java Wed Nov 21 22:08:45 2007
@@ -20,30 +20,132 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.web.actions.AbstractRegistryAction;
+import org.wso2.registry.LogEntry;
+
+import java.util.List;
+import java.util.ArrayList;
public class RecentActivityAction extends AbstractRegistryAction {
- private String newRoleName;
+ private String resourcePath;
+ private String userName;
+ private String fromDate;
+ private String toDate;
+ private String filter;
+
+ private List activity = new ArrayList();
public String execute() throws Exception {
- if (newRoleName == null || newRoleName.equalsIgnoreCase("-- None --")) {
- return ActionSupport.ERROR;
+ if (resourcePath != null && resourcePath.equals("")) {
+ resourcePath = null;
+ }
+
+ if (userName != null && userName.equals("")) {
+ userName = null;
+ }
+
+ if (fromDate != null && fromDate.equals("")) {
+ fromDate = null;
+ }
+
+ if (toDate != null && toDate.equals("")) {
+ toDate = null;
+ }
+
+ if (filter == null) {
+ filter = "1";
+ }
+
+ int filterValue = -1;
+ if (filter.equals("2")) {
+ filterValue = LogEntry.UPDATE;
+
+ } else if (filter.equals("3")) {
+ filterValue = LogEntry.COMMENT;
+
+ } else if (filter.equals("4")) {
+ filterValue = LogEntry.TAG;
+
+ } else if (filter.equals("5")) {
+ filterValue = LogEntry.RATING;
+
}
SecureRegistry secureRegistry = (SecureRegistry) getRegistry();
- RegistryUserManager userManager = secureRegistry.getUserManager();
+ LogEntry[] logs = secureRegistry.getLogs(resourcePath, filterValue, userName, null, null);
+
+ for (int i = 0; i < logs.length; i++) {
- userManager.addRole(newRoleName);
+ LogEntry logEntry = logs[i];
+
+ if (logEntry.getAction() == LogEntry.UPDATE) {
+ String entry = logEntry.getUserName() + " has updated the resource '" + logEntry.getResourcePath() + "' on " + logEntry.getDate().toString() + ".";
+ activity.add(entry);
+
+ } else if (logEntry.getAction() == LogEntry.COMMENT) {
+ String entry = logEntry.getUserName() + " has commented on resource '" + logEntry.getResourcePath() + "' on " + logEntry.getDate().toString() + " with the following comment.<br/>" + logEntry.getActionData();
+ activity.add(entry);
+
+ } else if (logEntry.getAction() == LogEntry.TAG) {
+ String entry = logEntry.getUserName() + " has tagged the resource '" + logEntry.getResourcePath() + "' with tag '" + logEntry.getActionData() + "' on " + logEntry.getDate().toString() + ".";
+ activity.add(entry);
+
+ } else if (logEntry.getAction() == LogEntry.RATING) {
+ String entry = logEntry.getUserName() + " has rated the resource '" + logEntry.getResourcePath() + "' with rating " + logEntry.getActionData() + " on " + logEntry.getDate().toString() + ".";
+ activity.add(entry);
+
+ }
+ }
return ActionSupport.SUCCESS;
}
- public String getNewRoleName() {
- return newRoleName;
+ public String getResourcePath() {
+ return resourcePath;
+ }
+
+ public void setResourcePath(String resourcePath) {
+ this.resourcePath = resourcePath;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getFromDate() {
+ return fromDate;
+ }
+
+ public void setFromDate(String fromDate) {
+ this.fromDate = fromDate;
+ }
+
+ public String getToDate() {
+ return toDate;
+ }
+
+ public void setToDate(String toDate) {
+ this.toDate = toDate;
+ }
+
+ public String getFilter() {
+ return filter;
+ }
+
+ public void setFilter(String filter) {
+ this.filter = filter;
+ }
+
+ public List getActivity() {
+ return activity;
}
- public void setNewRoleName(String newRoleName) {
- this.newRoleName = newRoleName;
+ public void setActivity(List activity) {
+ this.activity = activity;
}
}
\ No newline at end of file
Added: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java
==============================================================================
--- (empty file)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/UserDetailsAction.java Wed Nov 21 22:08:45 2007
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.wso2.registry.web.actions;
+
+import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.secure.RegistryUserManager;
+import org.wso2.usermanager.Realm;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class UserDetailsAction extends AbstractRegistryAction {
+
+ private String userName;
+ private List userRoles = new ArrayList();
+
+ public String execute() throws Exception {
+
+ SecureRegistry secureRegistry = (SecureRegistry) getRegistry();
+ RegistryUserManager userManager = secureRegistry.getUserManager();
+
+ Realm realm = userManager.getRealm();
+ String[] rolesArray = realm.getUserStoreReader().getUserRoles(userName);
+ for (int i = 0; i < rolesArray.length; i++) {
+ userRoles.add(rolesArray[i]);
+ }
+
+ return super.execute(); //To change body of overridden methods use File | Settings | File Templates.
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public List getUserRoles() {
+ return userRoles;
+ }
+
+ public void setUserRoles(List userRoles) {
+ this.userRoles = userRoles;
+ }
+}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/tiles/recent_activity.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/tiles/recent_activity.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/tiles/recent_activity.jsp Wed Nov 21 22:08:45 2007
@@ -5,46 +5,49 @@
<div class="heading">Recent activity</div>
<br/>
-<s:form name="recentActivity" action='#' theme="simple" >
-<table cellpadding="0" cellspacing="0" border="0" class="form-table" style="width:500px;">
- <tr>
- <td style="width:100px;">Username</td>
- <td><s:textfield name="userName"/></td>
- </tr>
- <tr>
- <td>Path</td>
- <td><s:textfield name="path"/></td>
- </tr>
- <tr>
- <td>Date -</td>
- <td>
- <div style="width:200px;">Only find results updated</div>
- From<s:textfield name="fromDate"/>
- To: <s:textfield name="toDate"/>
-
- </td>
-
- </tr>
- <tr>
- <td>Filter by</td>
- <td>
- <select>
- <option value ="volvo">Comments</option>
- <option value ="saab">Taging</option>
- <option value ="opel">Resource</option>
- </select>
- </td>
- </tr>
-
-</table>
+<s:form name="recentActivity" action='RecentActivity.action' theme="simple" >
+ <table cellpadding="0" cellspacing="0" border="0" class="form-table" style="width:500px;">
+ <tr>
+ <td style="width:100px;">Username</td>
+ <td><s:textfield name="userName"/></td>
+ </tr>
+ <tr>
+ <td>Path</td>
+ <td><s:textfield name="resourcePath"/></td>
+ </tr>
+ <tr>
+ <td>Date -</td>
+ <td>
+ <div style="width:200px;">Only find results updated</div>
+ From<s:textfield name="fromDate"/>
+ To: <s:textfield name="toDate"/>
+
+ </td>
+
+ </tr>
+ <tr>
+ <td>Filter by</td>
+ <td>
+
+ <s:select label="Filter by"
+ name="filter"
+ headerKey="1"
+ headerValue="-- All activity --"
+ list="#{'2':'Resource activity','3':'Comments','4':'Taggings','5':'Ratings'}"/>
+ </td>
+ </tr>
+ <tr>
+ <td><s:submit value="View activity"/></td>
+ </tr>
+
+ </table>
</s:form>
-<div style="background-color:#cccccc;color:#000000;padding-left:10px;height:25px;margin-top:10px;margin-bottom:10px;">Recent Activities</div>
+<div style="background-color:#cccccc;color:#000000;padding-left:10px;height:25px;margin-top:10px;margin-bottom:10px;">Recent Activities</div>
<table cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td>Line one .... . ... ...</td>
-</tr>
-<tr>
- <td>Line 2 .... . ... ...</td>
-</tr>
+ <s:iterator value="activity">
+ <tr>
+ <td><s:property/></td>
+ </tr>
+ </s:iterator>
</table>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user.jsp Wed Nov 21 22:08:45 2007
@@ -10,31 +10,55 @@
<br/>
<div class="heading"><s:text name="title.UserPage"/></div>
<div class="detail-section">
- <div class="description"><label><strong><s:text name="label.username"/></strong></label></div>
- <div class="description"><label><strong><s:text name="label.friendlyname"/></strong></label></div>
-
+ <div class="description"><label><strong><s:text name="label.username"/></strong></label><s:property value="userName"/></div>
+ <div class="description"><label><strong><s:text name="label.friendlyname"/></strong></label></div>
+
</div>
+<br/><br/>
+
+<strong>Roles of the user</strong>
+<ul>
+ <s:iterator value="userRoles">
+ <li><s:property/> <a href="RemoveUserRole.action?userName=<s:property value="userName"/>&roleName=<s:property/>"><img src="images/delete.gif" title="Delete" width="20" height="20" border="0" align="absmiddle"></a></li>
+ </s:iterator>
+</ul>
+
+<div class="detail-section">
+ <strong>Add user to role</strong>
+
+ <s:form name="frmTag" action='AddUserRole.action' theme="simple" >
+ <s:hidden name="userName" value="%{userName}" />
+ <s:select label="Role"
+ name="userToAuthorize"
+ headerKey="1"
+ headerValue="-- Please Select --"
+ list="userNames"/>
+ <s:submit value="Add" />
+ </s:form>
+
+</div><br/>
+
<br><br>
<div class="heading"><s:text name="title.UserPermission"/></div>
<img src="images/blank.gif" width="10" height="12" />
<div class="detail-section">
-
- <table class="data" width="100%" border="0" cellpadding="5" cellspacing="0">
- <tr class="headers">
- <td align="left">Action</td>
- <td align="center"> Allow</td>
- <td align="center"> Deny</td>
- </tr>
- <tr>
- <td>Create users </td>
- <td align="center"><input type="checkbox" name="checkbox" value="checkbox"></td>
- <td align="center"><input type="checkbox" name="checkbox" value="checkbox"></td>
- </tr>
-</table>
- <br>
+
+ <table class="data" width="100%" border="0" cellpadding="5" cellspacing="0">
+ <tr class="headers">
+ <td align="left">Action</td>
+ <td align="center"> Allow</td>
+ <td align="center"> Deny</td>
+ </tr>
+ <tr>
+ <td>Create users </td>
+ <td align="center"><input type="checkbox" name="checkbox" value="checkbox"></td>
+ <td align="center"><input type="checkbox" name="checkbox" value="checkbox"></td>
+ </tr>
+ </table>
+ <br>
</div>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user_management.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user_management.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user_management.jsp Wed Nov 21 22:08:45 2007
@@ -9,7 +9,7 @@
<strong>Users</strong>
<ul>
<s:iterator value="userNames">
- <li><s:property/> <a href="RemoveUser.action?userName=<s:property/>"><img src="images/delete.gif" title="Delete" width="20" height="20" border="0" align="absmiddle"></a></li>
+ <li><a href="UserDetails.action?userName=<s:property/>"><s:property/></a> <a href="RemoveUser.action?userName=<s:property/>"><img src="images/delete.gif" title="Delete" width="20" height="20" border="0" align="absmiddle"></a></li>
</s:iterator>
</ul>
More information about the Registry-dev
mailing list