Author: chathura
Date: Tue Dec 4 21:00:16 2007
New Revision: 10507
Log:
Integrated the simple search in the UI.
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
- copied, changed from r10499,
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java
Removed:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java
Modified:
trunk/registry/modules/webapps/conf/registry.xml
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/webapp/admin/header.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
Modified: trunk/registry/modules/webapps/conf/registry.xml
==============================================================================
--- trunk/registry/modules/webapps/conf/registry.xml (original)
+++ trunk/registry/modules/webapps/conf/registry.xml Tue Dec 4 21:00:16 2007
@@ -32,7 +32,7 @@
<result name="error" type="tiles">resources.definition</result>
</action>
- <action name="Search"
class="org.wso2.registry.web.actions.SearchCollectionViewAction">
+ <action name="Search"
class="org.wso2.registry.web.actions.SearchAction">
<result name="success"
type="tiles">searchresults.definition</result>
<result name="error" type="tiles">searchresults.definition</result>
</action>
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
Tue Dec 4 21:00:16 2007
@@ -22,7 +22,6 @@
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.web.UIConstants;
import org.wso2.registry.web.actions.*;
-import org.wso2.registry.web.ActionInvoker;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -214,7 +213,7 @@
forwardToResources(request, response, path);
} else if (command.equals("/addResource")) {
-
+
handleFileUpload(request, response);
}
}
@@ -308,7 +307,7 @@
// session. so the user's path is known from any part of the UI.
request.getSession().setAttribute(UIConstants.PATH_ATTR, path);
- forwardToResources(request, response, path);
+ forwardToResources(request, response, path);
} else if (controlPart.startsWith(RegistryConstants.PATH_SEPARATOR +
UIConstants.SYSTEM_PATH)) {
@@ -395,6 +394,11 @@
}
forwardToUserManagement(request, response);
+
+ } else if (command.equals("/search")) {
+
+ forwardToSearch(request, response);
+
}
}
}
@@ -564,6 +568,28 @@
}
}
+ private void forwardToSearch(HttpServletRequest request,
HttpServletResponse response) {
+
+ SearchAction searchAction = new SearchAction();
+ searchAction.setTag(request.getParameter("criteria"));
+
+ try {
+ searchAction.execute(request);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ request.getSession().setAttribute(UIConstants.SEARCH_BEAN,
searchAction);
+
+ try {
+
request.getRequestDispatcher(UIConstants.SEARCH_JSP).forward(request, response);
+ } catch (ServletException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
private void forwardToUserPage(HttpServletRequest request,
HttpServletResponse response, String userName) {
String uri = request.getRequestURI();
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
Tue Dec 4 21:00:16 2007
@@ -23,6 +23,7 @@
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 SEARCH_BEAN = "search";
public static final String USER_BEAN = "userBean";
public static final String WEB_PATH = "web";
@@ -35,6 +36,7 @@
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 SEARCH_JSP = "/admin/search.jsp";
public static final String USER_JSP = "/admin/user.jsp";
public static final String RESOURCE_DETAILS_JSP =
"/admin/resources_details.jsp";
}
Copied:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
(from r10499,
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java)
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
Tue Dec 4 21:00:16 2007
@@ -23,10 +23,11 @@
import org.wso2.registry.secure.AuthorizationFailedException;
import org.wso2.registry.web.actions.utils.ResourceData;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.ArrayList;
-public class SearchCollectionViewAction extends AbstractRegistryAction {
+public class SearchAction extends AbstractRegistryAction {
/**
* Generate the collection view from the results of the tag search. This
scenario is implemented
@@ -43,8 +44,10 @@
private String status;
private String errorMessage;
- public String execute() throws Exception {
+ public String execute(HttpServletRequest request) throws Exception {
+ setRequest(request);
+
// get the resource for the queryPath
// get all its children and fill ResourceOverview objects
// add ResourceOverview object to the resourceDataList list
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 Tue Dec
4 21:00:16 2007
@@ -11,48 +11,50 @@
String userName = (String)
request.getSession().getAttribute(UIConstants.USER_ATTR);
%>
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
- <tr>
- <td class="baner-left"></td>
- <td class="baner" align="right">
- <table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td><img
src="/wso2registry/admin/images/search-left.gif" /></td>
- <td class="search-box">
- <input type="text" class="input-text"
/>
- <input type="button" class="button"
value="Search" />
- </td>
- <td class="search-box">
- <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>
- </table>
- <ul class="top-menu">
-
- <%
- if (userName.equals(RegistryConstants.ANONYMOUS_USER)) {
- %>
-
- <li><a href="/wso2registry/admin/signin.jsp"
class="menu-logout">Sign in</a></li>
-
- <% } else { %>
-
- <li><a href="/wso2registry/system/signout"
class="menu-logout">Sign out</a></li>
- <li><%=userName%> Logged in</li>
-
- <% } %>
-
- <li> | </li>
- <li><a href="/wso2registry/system/activity/new"
class="menu-recent-activity">Activity</a></li>
- <li> | </li>
- <li><a href="/wso2registry/system/people"
class="menu-user-mange">People</a></li>
- <li> | </li>
- <li><a href="<%=webPath%>"
class="menu-registryResources">Resources</a></li>
- </ul>
- <br style="clear:both;" />
- </td>
- <td class="baner-right"></td>
- </tr>
-</table>
+ <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
+ <tr>
+ <td class="baner-left"></td>
+ <td class="baner" align="right">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td><img
src="/wso2registry/admin/images/search-left.gif" /></td>
+ <td class="search-box">
+ <form action="/wso2registry/system/search"
method="get">
+ <input type="text" name="criteria"
class="input-text" />
+ <input type="submit" class="button"
value="Search" />
+ </form>
+ </td>
+ <td class="search-box">
+ <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>
+ </table>
+ <ul class="top-menu">
+
+ <%
+ if (userName.equals(RegistryConstants.ANONYMOUS_USER))
{
+ %>
+
+ <li><a href="/wso2registry/admin/signin.jsp"
class="menu-logout">Sign in</a></li>
+
+ <% } else { %>
+
+ <li><a href="/wso2registry/system/signout"
class="menu-logout">Sign out</a></li>
+ <li><%=userName%> Logged in</li>
+
+ <% } %>
+
+ <li> | </li>
+ <li><a href="/wso2registry/system/activity/new"
class="menu-recent-activity">Activity</a></li>
+ <li> | </li>
+ <li><a href="/wso2registry/system/people"
class="menu-user-mange">People</a></li>
+ <li> | </li>
+ <li><a href="<%=webPath%>"
class="menu-registryResources">Resources</a></li>
+ </ul>
+ <br style="clear:both;" />
+ </td>
+ <td class="baner-right"></td>
+ </tr>
+ </table>
</div>
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp Tue Dec
4 21:00:16 2007
@@ -3,6 +3,7 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="org.wso2.registry.web.actions.utils.ResourceData" %>
+<%@ page import="org.wso2.registry.web.actions.SearchAction" %>
<%@ 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";>
@@ -17,7 +18,7 @@
<div class="page-sizer">
<%
- AdvancedSearchAction advancedSearchAction = (AdvancedSearchAction)
request.getSession().getAttribute(UIConstants.ADVANCED_SEARCH_BEAN);
+ SearchAction searchAction = (SearchAction)
request.getSession().getAttribute(UIConstants.SEARCH_BEAN);
%>
<!-- START header content -->
@@ -46,7 +47,7 @@
</tr>
<%
- List resourceDataList =
advancedSearchAction.getResourceDataList();
+ List resourceDataList = searchAction.getResourceDataList();
Iterator i = resourceDataList.iterator();
while (i.hasNext()) {
ResourceData resourceData = (ResourceData) i.next();
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
