Author: chathura
Date: Mon Jan 28 21:14:48 2008
New Revision: 13101
Log:
Displayed full URL in permalinks.
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
Mon Jan 28 21:14:48 2008
@@ -63,6 +63,12 @@
return registry;
}
+ public String getServerBaseURL() {
+ String reqURL = request.getRequestURL().toString();
+ String serverBaseURL = reqURL.substring(0,
reqURL.indexOf("/wso2registry"));
+ return serverBaseURL;
+ }
+
public boolean isLoggedIn() throws RegistryException {
Registry registry = getRegistry();
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
Mon Jan 28 21:14:48 2008
@@ -191,7 +191,7 @@
if (versionView) {
- String[] parts = path.split("?v=");
+ String[] parts = path.split("\\?v=");
if (parts.length == 2) {
activeResourcePath = parts[0];
} else {
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
Mon Jan 28 21:14:48 2008
@@ -26,7 +26,7 @@
%>
<tr>
- <th valign="top" style="width:140px;">User Rating:</th>
+ <th valign="top" style="width:140px;">My Rating:</th>
<td>
<div>
<img src="/wso2registry/admin/images/r<%=userStars[0]%>.gif"/>
@@ -44,7 +44,7 @@
} else {
%>
<tr>
- <th valign="top" style="width:140px;">User Rating:</th>
+ <th valign="top" style="width:140px;">My Rating:</th>
<td>
<div id="ratingDivUser">
<span initialState="<%=userStars[0]%> <%=userStars[1]%>
<%=userStars[2]%> <%=userStars[3]%> <%=userStars[4]%>" />
@@ -76,7 +76,7 @@
</tr>
<% } } %>
<tr>
- <th valign="top" style="width:140px;">Average Rating:</th>
+ <th valign="top" style="width:140px;">Rating:</th>
<td>
<div id="ratingDivAvg">
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Mon Jan 28 21:14:48 2008
@@ -116,9 +116,9 @@
<tr><th>Last
Updated:</th><td><%=details.getFormattedLastModified()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
<tr><th>Media Type:</th><td colspan="3"><% if (details.getMediaType()
!= null) { %><%=details.getMediaType()%><% } else { %>Unknown<% } %></td> </tr>
<% if (details.isCollection()) { %>
- <tr><th>Permalink:</th><td colspan="3"><a
href="/wso2registry/web<%=details.getPermalink()%>"><%=details.getPermalink()%></a></td></tr>
+ <tr><th>Permalink:</th><td colspan="3"><a
href="/wso2registry/web<%=details.getPermalink()%>"><%=details.getServerBaseURL()%>/wso2registry/web<%=details.getPermalink()%></a></td></tr>
<% } else { %>
- <tr><th>Permalink:</th><td colspan="3"><a target="_blank"
href="/wso2registry/resources<%=details.getPermalink()%>"><%=details.getPermalink()%></a></td></tr>
+ <tr><th>Permalink:</th><td colspan="3"><a target="_blank"
href="/wso2registry/resources<%=details.getPermalink()%>"><%=details.getServerBaseURL()%>/wso2registry/resources<%=details.getPermalink()%></a></td></tr>
<% } %>
<% if (!details.isVersionView()) { %><tr><th>Versions</th><td
colspan="3"><a href="/wso2registry/versions<%=details.getPath()%>">View
versions</a></td> </tr><% } %>
</table>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
