[Registry-dev] svn commit r19918 - in trunk/registry/modules: core/src/main/java/org/wso2/registry core/src/main/java/org/wso2/registry/jdbc/handlers webapps/src/main/java/org/wso2/registry/web webapps/src/main/java/org/wso2/registry/web/actions webapps/src/main/java/org/wso2/registry/web/utils webapps/src/main/webapp/admin
glen at wso2.com
glen at wso2.com
Wed Jul 23 19:17:58 PDT 2008
Author: glen
Date: Wed Jul 23 19:17:58 2008
New Revision: 19918
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19918
Log:
* Set up for storing default search type as a session variable. Switch to "Content" as the default, but as yet no code for actually storing the selected type into the session. IMO we need to have a system of storing user preferences in the Registry itself....
* A few tiny bits of code cleanup, and fix a spelling error.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/RegistryConstants.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourcePath.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/XSLTBasedUIEnabledHandler.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/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/RegistryConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/core/src/main/java/org/wso2/registry/RegistryConstants.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/RegistryConstants.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/RegistryConstants.java Wed Jul 23 19:17:58 2008
@@ -125,12 +125,12 @@
// Separator used to access Registry metadata - i.e. "/resource$tags"
public static final String URL_SEPARATOR = ";";
- public static final String URL_PARAMETER_SEPERATOR = ":";
+ public static final String URL_PARAMETER_SEPARATOR = ":";
- public static final String VIEW_ACTION = ";view";
+ public static final String VIEW_ACTION = URL_SEPARATOR + "view";
public static final String VIEW_PROPERTY = "view";
- public static final String EDIT_ACTION = ";edit";
+ public static final String EDIT_ACTION = URL_SEPARATOR + "edit";
public static final String EDIT_PROPERTY = "edit";
public static final String UI_CONTENT_PROPERTY = "UI.content";
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourcePath.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourcePath.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourcePath.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourcePath.java Wed Jul 23 19:17:58 2008
@@ -40,7 +40,7 @@
path = parts[0];
for (int i = 1; i < parts.length; i++) {
- String[] paramParts = parts[i].split(RegistryConstants.URL_PARAMETER_SEPERATOR);
+ String[] paramParts = parts[i].split(RegistryConstants.URL_PARAMETER_SEPARATOR);
String key = paramParts[0];
String value = null;
if (paramParts.length > 1) {
@@ -52,7 +52,7 @@
// parameter name: p1
// parameter value: v1:v2
for (int j = 2; j < paramParts.length; j++) {
- value = value + RegistryConstants.URL_PARAMETER_SEPERATOR + paramParts[j];
+ value = value + RegistryConstants.URL_PARAMETER_SEPARATOR + paramParts[j];
}
parameters.put(key, value);
@@ -75,4 +75,8 @@
public String getParameterValue(String key) {
return parameters.get(key);
}
+
+ public String toString() {
+ return completePath;
+ }
}
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/XSLTBasedUIEnabledHandler.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/XSLTBasedUIEnabledHandler.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/XSLTBasedUIEnabledHandler.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/XSLTBasedUIEnabledHandler.java Wed Jul 23 19:17:58 2008
@@ -89,7 +89,8 @@
requestContext.getRegistry().get(requestContext.getResourcePath().getPath());
try {
- viewTransformer.setParameter("resourcePath", requestContext.getResourcePath());
+ viewTransformer.setParameter("resourcePath",
+ requestContext.getResourcePath().toString());
viewTransformer.transform(
new StreamSource(resource.getContentStream()), new StreamResult(byteOut));
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- 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 Wed Jul 23 19:17:58 2008
@@ -80,4 +80,6 @@
public static final String ERROR_JSP = "/admin/error.jsp";
public static final String ABOUT_JSP = "/admin/about.jsp";
public static final String AJAX_ERROR = "/admin/ajax/error.jsp";
+
+ public static final String SEARCH_TYPE = "registry.searchType";
}
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java Wed Jul 23 19:17:58 2008
@@ -196,7 +196,6 @@
if (path.endsWith(RegistryConstants.VIEW_ACTION)) {
UIAction = RegistryConstants.VIEW_PROPERTY;
-
} else if (path.endsWith(RegistryConstants.EDIT_ACTION)) {
UIAction = RegistryConstants.EDIT_PROPERTY;
}
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java Wed Jul 23 19:17:58 2008
@@ -69,14 +69,10 @@
writer.write("SUCCESS: User authenticated.");
writer.flush();
- return;
-
} else {
if(userName.contains("<")) userName="";
writer.write("ERROR: Could not authenticate user " + userName);
writer.flush();
- return;
-
}
} catch (Exception e) {
@@ -106,8 +102,8 @@
private static boolean containsString(String value, String[] sArray) {
- for (int i = 0; i < sArray.length; i++) {
- if (sArray[i].equals(value)) {
+ for (String aSArray : sArray) {
+ if (aSArray.equals(value)) {
return true;
}
}
@@ -168,4 +164,19 @@
request.getRequestDispatcher(UIConstants.AJAX_USER_PASSWORD_JSP).forward(request,response);
}
+ public static String generateOptionsFor(String value, String [] options) {
+ StringBuffer ret = new StringBuffer();
+ for (String option : options) {
+ ret.append("<option value=\"");
+ ret.append(option);
+ ret.append("\"");
+ if (option.equalsIgnoreCase(value)) {
+ ret.append(" selected");
+ }
+ ret.append(">");
+ ret.append(option);
+ ret.append("</option>\n");
+ }
+ return ret.toString();
+ }
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp?rev=19918&r1=19917&r2=19918&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Wed Jul 23 19:17:58 2008
@@ -12,6 +12,7 @@
<%@ page import="org.wso2.registry.web.beans.VersionsBean" %>
<%@ page import="org.wso2.registry.web.utils.CommonUtil" %>
<%@ page import="java.util.*" %>
+<%@ page import="org.wso2.registry.web.utils.UserUtil" %>
<%
ResourceDetailsAction details = (ResourceDetailsAction) request.getSession().getAttribute(UIConstants.RESOURCE_BEAN);
List iNavPaths = details.getNavigatablePaths();
@@ -67,6 +68,9 @@
<div class="header">
<%
+ String searchType = (String)request.getSession().getAttribute(UIConstants.SEARCH_TYPE);
+ if (searchType == null) searchType = "content";
+
String path = (String) request.getSession().getAttribute(UIConstants.PATH_ATTR);
String webPath = "/wso2registry/web";
if (path != null) {
@@ -163,9 +167,9 @@
</td>
<td class="top-menu">
<select name="searchType" id="searchType">
- <option VALUE="Tag">Tag</option>
- <option VALUE="Content">Content</option>
- </select>
+ <%=UserUtil.generateOptionsFor(searchType,
+ new String [] { "Content", "Tag" })%>
+ </select>
</td>
<td valign="middle" class="top-menu" style="margin-top:-50px;">
<a href="#" onclick="submitSearchForm();" title="Search" ><img src="/wso2registry/admin/images/icon-search.gif" border="0" /></a><!-- input type="submit" class="button" value="Search" / -->
More information about the Registry-dev
mailing list