Author: chathura
Date: Mon Dec 3 01:39:45 2007
New Revision: 10413
Log:
Added a non-authenticating constructor to the SecureRegistry.
Implemented the advanced search.
More integrating work of the new UI.
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resource_detail.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general_old.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/searched_resources.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/user_management.jsp
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
Mon Dec 3 01:39:45 2007
@@ -89,6 +89,41 @@
this.userManager = new RegistryUserManager(userRealm, userID);
}
+ /**
+ * Non-authenticating contructor. Use this constructor if the user is
already authenticated
+ * outside the secure registry.
+ *
+ * @param userID user name of the user of the secure registry.
+ * @param registry core registry to use by the secure registry.
+ * @param defaultRealm default (non-authorizing) realm.
+ * @throws RegistryException
+ */
+ public SecureRegistry(String userID, Registry registry, Realm defaultRealm)
+ throws RegistryException {
+
+ Realm userRealm;
+ try {
+
+ userRealm = new AuthorizingRealm();
+ AuthorizingRealmConfig config = (AuthorizingRealmConfig) userRealm
+ .getRealmConfiguration();
+ config.setRealm(defaultRealm);
+ config.setAuthenticatedUserName(userID);
+ userRealm.init(config);
+
+ authorizer = userRealm.getAuthorizer();
+
+ } catch (UserManagerException e) {
+ String msg = "Could not check authentication. \nCaused by " +
e.getMessage();
+ log.error(msg, e);
+ throw new RegistryException(msg);
+ }
+
+ this.userID = userID;
+ this.registry = registry;
+ this.userManager = new RegistryUserManager(userRealm, userID);
+ }
+
public String getUserID() {
return userID;
}
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
Mon Dec 3 01:39:45 2007
@@ -175,4 +175,151 @@
// e.printStackTrace();
// }
//}
+
+ public void testAdvancedSearch() {
+
+ try {
+
+ String resourcePath = "";
+ String authorName = "";
+ String updaterName = "xSamitha";
+ String tags = "";
+ String commentWords = "";
+ String content;
+ String resultType;
+
+ // create the sql
+
+ boolean queryStarted = false;
+
+ String pathQuery = "";
+ if (resourcePath != null && resourcePath.length() != 0) {
+ pathQuery = " WHERE R.PATH='" + resourcePath + "'";
+ queryStarted = true;
+ }
+
+ String authorQuery = "";
+ if (authorName != null && authorName.length() != 0) {
+ if (queryStarted) {
+ authorQuery = " AND R.AUTHOR='" + authorName + "'";
+ } else {
+ authorQuery = " WHERE R.AUTHOR='" + authorName + "'";
+ queryStarted = true;
+ }
+ }
+
+ //String sql = "SELECT A.AID FROM ARTIFACTS A, VERSIONS V, TAGS T,
COMMENTS C WHERE A.AID=V.AID AND V.VN IN (SELECT MAX(V2.VN) FROM VERSIONS V2
WHERE A.AID=V2.AID) AND A.AID=T.AID AND A.AID=C.AID AND A.PATH='c1200/r4'";
+ String fromVersions = "";
+ String versionQuery = "";
+ if (updaterName != null && updaterName.length() != 0) {
+ fromVersions = ", VERSIONS V";
+ if (queryStarted) {
+ versionQuery = " AND V.AID=R.AID AND V.VN IN (SELECT
MAX(V2.VN) FROM VERSIONS V2 WHERE R.AID=V2.AID) AND V.AUTHOR='" + updaterName +
"'";
+ } else {
+ versionQuery = " WHERE V.AID=R.AID AND V.VN IN (SELECT
MAX(V2.VN) FROM VERSIONS V2 WHERE R.AID=V2.AID) AND V.AUTHOR='" + updaterName +
"'";
+ }
+ }
+
+ String fromComments = "";
+ String commentsQuery = "";
+ if (commentWords != null && commentWords.length() != 0) {
+ fromComments = ", COMMENTS C";
+ if (queryStarted) {
+ commentsQuery = " AND C.AID=R.AID AND C.COMMENT_TEXT LIKE
'" + commentWords + "'";
+ } else {
+ commentsQuery = " WHERE C.AID=R.AID AND C.COMMENT_TEXT
LIKE '%" + commentWords + "%'";
+ queryStarted = true;
+ }
+ }
+
+ String fromTags = "";
+ String tagsQuery = "";
+ if (tags != null && tags.length() != 0) {
+ String[] tag = tags.split(" ");
+ if (tag.length > 0) {
+ fromTags = ", TAGS T";
+
+ // todo: complete with OR tags
+ if (queryStarted) {
+ tagsQuery = " AND T.AID=R.AID AND";
+ } else {
+ tagsQuery = " WHERE T.AID=R.AID AND";
+ queryStarted = true;
+ }
+
+ tagsQuery = tagsQuery + " (T.TAG_NAME='" + tag[0] + "'";
+ for (int i = 1; i < tag.length; i++) {
+ tagsQuery = tagsQuery + " OR T.TAG_NAME='" + tag[i] +
"'";
+ }
+ tagsQuery = tagsQuery + ")";
+ }
+ }
+
+ String sql = "SELECT R.PATH FROM ARTIFACTS R" + fromVersions +
fromComments + fromTags + pathQuery + authorQuery + versionQuery +
commentsQuery + tagsQuery;
+
+ Resource q1 = new Resource();
+ q1.setContent(sql);
+ q1.setMediaType(RegistryConstants.SQL_QUERY_MEDIA_TYPE);
+ q1.setProperty(RegistryConstants.RESULT_TYPE_PROPERTY_NAME,
+ RegistryConstants.RESOURCES_RESULT_TYPE);
+ registry.put("/advanced/q1", q1);
+
+ SecureRegistry adminRegistry =
+ new SecureRegistry(RegistryConstants.ADMIN_USER, "admin",
registry, realm);
+ RegistryUserManager adminUserManager =
+ new RegistryUserManager(realm,
RegistryConstants.ADMIN_USER);
+
+ adminUserManager.addUser("xChathura", "cce");
+ adminUserManager.addUserToRole("xChathura",
RegistryConstants.ADMIN_ROLE);
+ SecureRegistry chathuraRegistry =
+ new SecureRegistry("xChathura", "cce", registry, realm);
+
+ adminUserManager.addUser("xSamitha", "swe");
+ adminUserManager.addUserToRole("xSamitha",
RegistryConstants.ADMIN_ROLE);
+ SecureRegistry samithaRegistry =
+ new SecureRegistry("xSamitha", "swe", registry, realm);
+
+ String r1Content = "R1";
+ Resource r1 = new Resource();
+ r1.setContent(r1Content.getBytes());
+ adminRegistry.put("/c1200/r1", r1);
+
+ String r2Content = "R2";
+ Resource r2 = new Resource();
+ r2.setContent(r2Content.getBytes());
+ adminRegistry.put("/c1200/r2", r2);
+
+ String r3Content = "R3";
+ Resource r3 = new Resource();
+ r3.setContent(r3Content.getBytes());
+ chathuraRegistry.put("/c1200/r3", r3);
+
+ String r4Content = "R4";
+ Resource r4 = new Resource();
+ r4.setContent(r4Content.getBytes());
+ samithaRegistry.put("/c1200/r2", r4);
+
+ adminRegistry.applyTag("/c1200/r1", "java jsp software");
+ adminRegistry.applyTag("/c1200/r2", "java hibernate");
+ adminRegistry.applyTag("/c1200/r3", "c windows");
+
+ chathuraRegistry.addComment("/c1200/r2", new Comment("this is some
comment on this resource."));
+
+ //String r1v2Content = "R2";
+ //Resource r1v2 = new Resource();
+ //r1v2.setContent(r1v2Content.getBytes());
+ //chathuraRegistry.put("/c1200/r4", r1v2);
+
+ //String sql = "SELECT A.AID FROM ARTIFACTS A, VERSIONS V, TAGS T,
COMMENTS C WHERE A.AID=V.AID AND V.VN IN (SELECT MAX(V2.VN) FROM VERSIONS V2
WHERE A.AID=V2.AID) AND A.AID=T.AID AND A.AID=C.AID AND A.PATH='c1200/r4'";
+ //String sql = "SELECT A.PATH FROM ARTIFACTS A WHERE
A.PATH='/c1200/r4'";
+
+ Resource q1Results = registry.executeQuery("/advanced/q1", new
String[] {} );
+ int a = 1;
+
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+
+
+ }
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Mon Dec 3 01:39:45 2007
@@ -254,6 +254,14 @@
forwardToEmptyActivity(request, response);
+ } else if (command.equals("/search/advanced")) {
+
+ forwardToAdvancedSearch(request, response);
+
+ } else if (command.equals("/search/advanced/new")) {
+
+ forwardToNewAdvancedSearch(request, response);
+
}
}
@@ -385,4 +393,40 @@
e.printStackTrace();
}
}
+
+ private void forwardToNewAdvancedSearch(HttpServletRequest request,
HttpServletResponse response) {
+
+ AdvancedSearchAction advancedSearchAction = new AdvancedSearchAction();
+ request.getSession().setAttribute(UIConstants.ADVANCED_SEARCH_BEAN,
advancedSearchAction);
+
+ try {
+
request.getRequestDispatcher(UIConstants.ADVANCED_SEARCH_JSP).forward(request,
response);
+ } catch (ServletException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void forwardToAdvancedSearch(HttpServletRequest request,
HttpServletResponse response) {
+
+ AdvancedSearchAction advancedSearchAction = new AdvancedSearchAction();
+
advancedSearchAction.setResourcePath(request.getParameter("resourcePath"));
+ advancedSearchAction.setAuthorName(request.getParameter("author"));
+ advancedSearchAction.setUpdaterName(request.getParameter("updater"));
+ advancedSearchAction.setTags(request.getParameter("tags"));
+
advancedSearchAction.setCommentWords(request.getParameter("commentWords"));
+
+ advancedSearchAction.execute(request);
+
+ request.getSession().setAttribute(UIConstants.ADVANCED_SEARCH_BEAN,
advancedSearchAction);
+
+ try {
+
request.getRequestDispatcher(UIConstants.ADVANCED_SEARCH_JSP).forward(request,
response);
+ } catch (ServletException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
Mon Dec 3 01:39:45 2007
@@ -22,6 +22,7 @@
public static final String COLLECTION_BEAN = "collection";
public static final String USER_MANAGEMENT_BEAN = "user_management";
public static final String ACTIVITY_BEAN = "activity";
+ public static final String ADVANCED_SEARCH_BEAN = "advanced_search";
public static final String WEB_PATH = "web";
public static final String SYSTEM_PATH = "system";
@@ -31,5 +32,6 @@
public static final String RESOURCES_JSP = "/admin/registry-resources.jsp";
public static final String USER_MANAGEMENT_JSP = "/admin/people.jsp";
public static final String ACTIVITY_JSP = "/admin/recent-activity.jsp";
+ public static final String ADVANCED_SEARCH_JSP =
"/admin/advanced-search.jsp";
public static final String RESOURCE_DETAILS_JSP =
"/admin/resources_details.jsp";
}
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
==============================================================================
--- (empty file)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
Mon Dec 3 01:39:45 2007
@@ -0,0 +1,235 @@
+/*
+ * 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.*;
+import org.wso2.registry.web.actions.utils.ResourceData;
+import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.secure.RegistryUserManager;
+import org.wso2.registry.secure.AuthorizationFailedException;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.ArrayList;
+
+public class AdvancedSearchAction extends AbstractRegistryAction {
+
+ private String resourcePath;
+ private String authorName;
+ private String updaterName;
+ private String tags;
+ private String commentWords;
+ private String content;
+ private String resultType;
+
+ private List resourceDataList = new ArrayList();
+
+ public void execute(HttpServletRequest request) {
+
+ setRequest(request);
+
+ // contructing sqls is prefered here, as otherwise we have to create
and store very large
+ // number of query resources to support combined criterias.
+
+ try {
+
+ boolean queryStarted = false;
+
+ String pathQuery = "";
+ if (resourcePath != null && resourcePath.length() != 0) {
+ pathQuery = " WHERE R.PATH='" + resourcePath + "'";
+ queryStarted = true;
+ }
+
+ String authorQuery = "";
+ if (authorName != null && authorName.length() != 0) {
+ if (queryStarted) {
+ authorQuery = " AND R.AUTHOR='" + authorName + "'";
+ } else {
+ authorQuery = " WHERE R.AUTHOR='" + authorName + "'";
+ queryStarted = true;
+ }
+ }
+
+ //String sql = "SELECT A.AID FROM ARTIFACTS A, VERSIONS V, TAGS T,
COMMENTS C WHERE A.AID=V.AID AND V.VN IN (SELECT MAX(V2.VN) FROM VERSIONS V2
WHERE A.AID=V2.AID) AND A.AID=T.AID AND A.AID=C.AID AND A.PATH='c1200/r4'";
+ String fromVersions = "";
+ String versionQuery = "";
+ if (updaterName != null && updaterName.length() != 0) {
+ fromVersions = ", VERSIONS V";
+ if (queryStarted) {
+ versionQuery = " AND V.AID=R.AID AND V.VN IN (SELECT
MAX(V2.VN) FROM VERSIONS V2 WHERE R.AID=V2.AID) AND V.AUTHOR='" + updaterName +
"'";
+ } else {
+ versionQuery = " WHERE V.AID=R.AID AND V.VN IN (SELECT
MAX(V2.VN) FROM VERSIONS V2 WHERE R.AID=V2.AID) AND V.AUTHOR='" + updaterName +
"'";
+ }
+ }
+
+ String fromComments = "";
+ String commentsQuery = "";
+ if (commentWords != null && commentWords.length() != 0) {
+ fromComments = ", COMMENTS C";
+ if (queryStarted) {
+ commentsQuery = " AND C.AID=R.AID AND C.COMMENT_TEXT LIKE
'" + commentWords + "'";
+ } else {
+ commentsQuery = " WHERE C.AID=R.AID AND C.COMMENT_TEXT
LIKE '%" + commentWords + "%'";
+ queryStarted = true;
+ }
+ }
+
+ String fromTags = "";
+ String tagsQuery = "";
+ if (tags != null && tags.length() != 0) {
+ String[] tag = tags.split(" ");
+ if (tag.length > 0) {
+ fromTags = ", TAGS T";
+
+ // todo: complete with OR tags
+ if (queryStarted) {
+ tagsQuery = " AND T.AID=R.AID AND";
+ } else {
+ tagsQuery = " WHERE T.AID=R.AID AND";
+ queryStarted = true;
+ }
+
+ tagsQuery = tagsQuery + " (T.TAG_NAME='" + tag[0] + "'";
+ for (int i = 1; i < tag.length; i++) {
+ tagsQuery = tagsQuery + " OR T.TAG_NAME='" + tag[i] +
"'";
+ }
+ tagsQuery = tagsQuery + ")";
+ }
+ }
+
+ String sql = "SELECT R.PATH FROM ARTIFACTS R" + fromVersions +
fromComments + fromTags + pathQuery + authorQuery + versionQuery +
commentsQuery + tagsQuery;
+
+ Registry registry = getRegistry();
+ Resource q1 = new Resource();
+ q1.setContent(sql);
+ q1.setMediaType(RegistryConstants.SQL_QUERY_MEDIA_TYPE);
+ q1.setProperty(RegistryConstants.RESULT_TYPE_PROPERTY_NAME,
+ RegistryConstants.RESOURCES_RESULT_TYPE);
+ String qPath = "/queries/advanced/" + getUserName() + "/q1";
+ registry.put(qPath, q1);
+
+ Resource qResults = registry.executeQuery(qPath, new String[] {} );
+
+ String[] childPaths = (String[]) qResults.getContent();
+ for (int i = 0; i < childPaths.length; i++) {
+
+ ResourceData resourceData = new ResourceData();
+ resourceData.setResourcePath(childPaths[i]);
+
+ if (childPaths[i] != null) {
+ if (RegistryConstants.ROOT_PATH.equals(childPaths[i])) {
+ resourceData.setName("root");
+ } else {
+ String[] parts =
childPaths[i].split(RegistryConstants.PATH_SEPARATOR);
+ resourceData.setName(parts[parts.length - 1]);
+ }
+ }
+
+ try {
+ Resource child = registry.get(childPaths[i]);
+
+ resourceData.setResourceType(
+ child.isDirectory()? ResourceData.COLLECTION :
ResourceData.RESOURCE);
+ resourceData.setAuthorUserName(child.getAuthorUserName());
+ resourceData.setDescription(child.getDescription());
+
resourceData.setAverageRating(registry.getAverageRating(child.getPath()));
+ resourceData.setCreatedOn(child.getCreatedTime());
+
+ } catch (AuthorizationFailedException e) {
+
+ resourceData.setResourceType(ResourceData.UNKNOWN);
+ }
+
+ resourceDataList.add(resourceData);
+ }
+
+ } catch (
+ RegistryException e) {
+ e.printStackTrace();
+ }
+
+
+
+
+
+ }
+
+ public String getResourcePath() {
+ return resourcePath;
+ }
+
+ public void setResourcePath(String resourcePath) {
+ this.resourcePath = resourcePath;
+ }
+
+ public String getAuthorName() {
+ return authorName;
+ }
+
+ public void setAuthorName(String authorName) {
+ this.authorName = authorName;
+ }
+
+ public String getUpdaterName() {
+ return updaterName;
+ }
+
+ public void setUpdaterName(String updaterName) {
+ this.updaterName = updaterName;
+ }
+
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ public String getCommentWords() {
+ return commentWords;
+ }
+
+ public void setCommentWords(String commentWords) {
+ this.commentWords = commentWords;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getResultType() {
+ return resultType;
+ }
+
+ public void setResultType(String resultType) {
+ this.resultType = resultType;
+ }
+
+ public List getResourceDataList() {
+ return resourceDataList;
+ }
+
+ public void setResourceDataList(List resourceDataList) {
+ this.resourceDataList = resourceDataList;
+ }
+}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
Mon Dec 3 01:39:45 2007
@@ -16,10 +16,14 @@
package org.wso2.registry.web.actions.utils;
+import java.util.Date;
+
public class VersionPath {
private String completeVersionPath;
private long versionNumber;
+ private String updater;
+ private Date updatedOn;
public String getCompleteVersionPath() {
return completeVersionPath;
@@ -36,4 +40,20 @@
public void setVersionNumber(long versionNumber) {
this.versionNumber = versionNumber;
}
+
+ public String getUpdater() {
+ return updater;
+ }
+
+ public void setUpdater(String updater) {
+ this.updater = updater;
+ }
+
+ public Date getUpdatedOn() {
+ return updatedOn;
+ }
+
+ public void setUpdatedOn(Date updatedOn) {
+ this.updatedOn = updatedOn;
+ }
}
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
Mon Dec 3 01:39:45 2007
@@ -1,17 +1,26 @@
+<%@ page import="org.wso2.registry.web.actions.AdvancedSearchAction" %>
+<%@ page import="org.wso2.registry.web.UIConstants" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="org.wso2.registry.web.actions.utils.ResourceData" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
-<script language="JavaScript" type="text/JavaScript" src="js/common.js" />
-<link type="text/css" href="css/main.css" rel="stylesheet" />
+<script language="JavaScript" type="text/JavaScript"
src="/wso2registry/admin/js/common.js" />
+<link type="text/css" href="/wso2registry/admin/css/main.css" rel="stylesheet"
/>
<title>WSO2 Registry</title>
</head>
<body>
<div class="page-sizer">
+
+ <%
+ AdvancedSearchAction advancedSearchAction = (AdvancedSearchAction)
request.getSession().getAttribute(UIConstants.ADVANCED_SEARCH_BEAN);
+ %>
- <!-- START header content -->
+ <!-- START header content -->
<jsp:include page="header.jsp" />
<! START body content -->
@@ -22,7 +31,7 @@
<td style="width:700px;" valign="top">
- <form id="#" name="advancedSearch" onsubmit="return
true;" action="#" method="post">
+ <form id="advancedSearchForm" name="advancedSearch"
onsubmit="return true;" action="/wso2registry/system/search/advanced"
method="get">
<div class="resource-head">
<table cellpadding="0" cellspacing="0"
border="0" class="form-table">
<tr>
@@ -46,7 +55,7 @@
<tr>
<td
style="width:120px;">Resource Name</td>
<td>
- <input
type="text" name="resourceName" value="" id="#_resourceName"
style="width:100px;"/>
+ <input
type="text" name="resourcePath" value="" id="#_resourceName"
style="width:100px;"/>
</td>
@@ -73,32 +82,41 @@
</td>
</tr>
- <tr>
- <td>Tags</td>
+ <tr>
+ <td>Updated
by</td>
<td>
- <input
type="text" name="tags" value="" id="#_tags"/>
-
-
+ <input
type="text" name="updater" value="" id="#_author"/>
+
+
</td>
+
</tr>
- <tr>
-
-
<td>Comments</td>
+ <tr>
+ <td>Tags</td>
<td>
- <input
type="text" name="comments" value="" id="#_comments"/>
+ <input
type="text" name="tags" value="" id="#_tags"/>
</td>
</tr>
<tr>
- <td>Content</td>
+
<td>Comments</td>
<td>
- <input
type="text" name="content" value="" id="#_content"/>
+ <input
type="text" name="commentWords" value="" id="#_comments"/>
</td>
</tr>
+ <!--<tr>-->
+
<!--<td>Content</td>-->
+
+ <!--<td>-->
+
<!--<input type="text" name="content" value="" id="#_content"/>-->
+
+
+ <!--</td>-->
+ <!--</tr>-->
</table>
</div>
@@ -183,10 +201,17 @@
<th>Action</th>
</tr>
- <tr id="1">
- <td><a href="#"
class="folder-small">WSAS</a></td>
- <td>11/26/07 2:35:33 PM.046</td>
- <td>Admin</td>
+
+ <%
+ List resourceDataList =
advancedSearchAction.getResourceDataList();
+ Iterator i = resourceDataList.iterator();
+ while (i.hasNext()) {
+ ResourceData resourceData = (ResourceData) i.next();
+ %>
+ <tr id="1">
+ <td><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
class="folder-small"><%=resourceData.getResourcePath()%></a></td>
+
<td><%=resourceData.getCreatedOn()%></td>
+
<td><%=resourceData.getAuthorUserName()%></td>
<td>Rating</td>
<td><a href="#"
onclick="showDescription('1-des')"><img border="0" src="images/icon-show.gif"
/></a></td>
<td>
@@ -199,12 +224,13 @@
</tr>
<tr id="1-des" style="display:none;">
<td colspan="6"
class="table-description">
- Lorem ipsum dolor sit amet,
consectetuer adipiscing elit. Praesent urna. Integer nec nibh. Integer
tristique urna ut risus. Donec ornare, dui sed suscipit accumsan, massa nisi
placerat nulla, at volutpat dolor ante et lacus. Aliquam velit urna, dictum ut,
ultricies non, tincidunt at, magna. Duis suscipit, augue tristique scelerisque
bibendum, enim ante imperdiet mauris, quis ultricies tellus pede nec magna.
Donec ullamcorper, enim vitae luctus luctus, nisi purus pretium elit, quis
adipiscing pede ante sed est. In scelerisque, lacus quis vehicula fringilla,
tellus sapien dignissim libero, quis iaculis odio libero vel magna. Sed
molestie, turpis in blandit rhoncus, libero lacus facilisis quam, sit amet
viverra est ante vitae ante. Aenean ligula libero, gravida et, faucibus at,
faucibus quis, diam. Fusce placerat rhoncus lacus.
-
+
<%=resourceData.getDescription()%>
</td>
</tr>
-
- </table>
+
+ <% } %>
+
+ </table>
</td>
<td valign="top" style="padding-left:10px;padding-right:10px;">
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Mon Dec
3 01:39:45 2007
@@ -28,7 +28,7 @@
<input type="button" class="button"
value="Search" />
</td>
<td class="search-box">
- <a
href="/wso2registry/admin/advanced-search.jsp" class="advanced-search">Advanced
Search</a>
+ <a
href="/wso2registry/system/search/advanced/new"
class="advanced-search">Advanced Search</a>
</td>
<td><img
src="/wso2registry/admin/images/search-right.gif" /></td>
</tr>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp Mon Dec
3 01:39:45 2007
@@ -69,7 +69,7 @@
</table>
- <img src="images/blank.gif" width="10" height="12" /><br/>
+ <img src="/wso2registry/admin/images/blank.gif" width="10" height="12"
/><br/>
<input type="submit" class="button" value="Apply All Permissions" />
</form>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Mon Dec 3 01:39:45 2007
@@ -4,6 +4,7 @@
<%@ page import="java.util.Iterator" %>
<%@ page import="org.wso2.registry.web.actions.utils.ResourceData" %>
<%@ page import="org.wso2.registry.web.UIConstants" %>
+<%@ page import="org.wso2.registry.web.actions.utils.VersionPath" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
@@ -209,16 +210,21 @@
<th align="left">Modified</th>
<th colspan="2"></th>
</tr>
- <tr>
- <td>02</td><td>11/26/07-3.25p.m</td>
- <td align="right"><a href="#" title="Details"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a></td>
- <td align="right"><a href="#" title="Restore"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-restore.gif"
border="0" /></a></td>
- </tr>
- <tr>
- <td>01</td><td>11/21/07-1.25p.m</td>
+
+ <%
+ Iterator iVersions = details.getVersionPaths().iterator();
+ while (iVersions.hasNext()) {
+ VersionPath versionPath = (VersionPath) iVersions.next();
+ %>
+
+ <tr>
+
<td><%=versionPath.getVersionNumber()%></td><td><%=versionPath.getVersionNumber()%></td>
<td align="right"><a href="#" title="Details"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a></td>
<td align="right"><a href="#" title="Restore"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-restore.gif"
border="0" /></a></td>
</tr>
+
+ <% } %>
+
</table>
</div>
</td>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resource_detail.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resource_detail.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resource_detail.jsp
Mon Dec 3 01:39:45 2007
@@ -88,8 +88,8 @@
<div class="detail-section">
<s:iterator value="comments">
- <p><img src="images/comment.gif" width="30" height="30"
align="baseline" /><span><s:property value="commentText"/><br />
- <img src="images/blank.gif" width="1" height="18" />by
<s:property value="commentedUser"/> on <s:property
value="commentedTime"/></span></p>
+ <p><img src="/wso2registry/admin/images/comment.gif" width="30"
height="30" align="baseline" /><span><s:property value="commentText"/><br />
+ <img src="/wso2registry/admin/images/blank.gif"
width="1" height="18" />by <s:property value="commentedUser"/> on <s:property
value="commentedTime"/></span></p>
</s:iterator>
</div>
@@ -99,7 +99,7 @@
<s:form name="frmComment" action='Comment.action' theme="simple" >
<s:hidden name="path" value="%{path}" />
<s:textarea cols="70" rows="4" name="commentText"/><br/>
- <img src="images/blank.gif" width="10" height="5" /><br/>
+ <img src="/wso2registry/admin/images/blank.gif" width="10"
height="5" /><br/>
<s:submit value="Post comment" />
</s:form>
</div>
@@ -117,11 +117,11 @@
<br/>
<div class="heading"><s:text name="title.Permission"/></div>
-<img src="images/blank.gif" width="10" height="12" />
+<img src="/wso2registry/admin/images/blank.gif" width="10" height="12" />
<div class="detail-section">
<%--list="#{'01':'Chathura','02':'Asankha','03':'Deepal','04':'Ruwan','05':'Chanaka','06':'Amila'}"/><br/>--%>
- <img src="images/blank.gif" width="10" height="10" />
+ <img src="/wso2registry/admin/images/blank.gif" width="10" height="10" />
<table width="100%" border="0" cellpadding="5" cellspacing="0"
bgcolor="#ECECEC">
<tr>
@@ -193,7 +193,7 @@
</table>
- <img src="images/blank.gif" width="10" height="12" /><br/>
+ <img src="/wso2registry/admin/images/blank.gif" width="10" height="12"
/><br/>
<s:submit value="Apply All Permissions" />
</s:form>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general.jsp
Mon Dec 3 01:39:45 2007
@@ -70,8 +70,8 @@
</tr>
<tr>
- <td height="5" align="right" valign="top"><img
src="../images/blank.gif" width="1" height="5"></td>
- <td height="5" valign="top"><img src="../images/blank.gif"
width="1" height="5"></td>
+ <td height="5" align="right" valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="5"></td>
+ <td height="5" valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="5"></td>
</tr>
</s:iterator>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general_old.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general_old.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/resources_general_old.jsp
Mon Dec 3 01:39:45 2007
@@ -80,7 +80,7 @@
<tr>
<td valign="top"><table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
- <td valign="top"><img src="images/blank.gif" width="1"
height="10" />
+ <td valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="10" />
<table class="form-data2" width="100%" border="0"
cellspacing="0" cellpadding="3">
<tr>
<td width="3%"><strong>Tag:</strong></td>
@@ -150,7 +150,7 @@
<tr>
<td valign="top"><table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
- <td valign="top"><img src="images/blank.gif" width="1"
height="10" />
+ <td valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="10" />
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
<td><textarea name="textarea" id="textarea"
style="width:99.5%; *width:99%;" cols="50" rows="3"></textarea></td>
@@ -162,7 +162,7 @@
<table id="data" width="100%" class="table-style2"
border="0" cellspacing="0" cellpadding="0">
<s:iterator value="comments">
<tr>
- <!--<td width="10" align="center"
valign="middle"><img src="images/dhtmlgoodies_plus.gif" width="18" height="13"
/></td>-->
+ <!--<td width="10" align="center"
valign="middle"><img src="/wso2registry/admin/images/dhtmlgoodies_plus.gif"
width="18" height="13" /></td>-->
<td width="100%"><s:property
value="commentText"/> on <s:property value="commentedTime"/></td>
</tr>
</s:iterator>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/searched_resources.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/searched_resources.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/tiles/searched_resources.jsp
Mon Dec 3 01:39:45 2007
@@ -64,8 +64,8 @@
</tr>
<tr>
- <td height="5" align="right" valign="top"><img
src="../images/blank.gif" width="1" height="5"></td>
- <td height="5" valign="top"><img src="../images/blank.gif"
width="1" height="5"></td>
+ <td height="5" align="right" valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="5"></td>
+ <td height="5" valign="top"><img
src="/wso2registry/admin/images/blank.gif" width="1" height="5"></td>
</tr>
</s:iterator>
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
Mon Dec 3 01:39:45 2007
@@ -4,19 +4,19 @@
<div class="heading"><s:text name="title.UserManagement"/></div>
<br/>
-<img src="images/blank.gif" width="10" height="12" />
+<img src="/wso2registry/admin/images/blank.gif" width="10" height="12" />
<div class="detail-section">
<strong>Users</strong>
<ul>
<s:iterator value="userNames">
- <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>
+ <li><a
href="UserDetails.action?userName=<s:property/>"><s:property/></a> <a
href="RemoveUser.action?userName=<s:property/>"><img
src="/wso2registry/admin/images/delete.gif" title="Delete" width="20"
height="20" border="0" align="absmiddle"></a></li>
</s:iterator>
</ul>
<strong>Roles</strong>
<ul>
<s:iterator value="roleNames">
- <li><s:property/> <a
href="RemoveRole.action?roleName=<s:property/>"><img src="images/delete.gif"
title="Delete" width="20" height="20" border="0" align="absmiddle"></a></li>
+ <li><s:property/> <a
href="RemoveRole.action?roleName=<s:property/>"><img
src="/wso2registry/admin/images/delete.gif" title="Delete" width="20"
height="20" border="0" align="absmiddle"></a></li>
</s:iterator>
</ul>
</div>
\ No newline at end of file
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
