Author: tyrell Date: Tue Jul 8 03:05:36 2008 New Revision: 18959 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18959
Log: Adding the icon necessary for the monitor link in windows. Added: trunk/mashup/java/modules/distribution/bin/native/serverdown.ico (contents, props changed) Modified: trunk/mashup/java/modules/www/activity.jsp trunk/mashup/java/modules/www/faulty_mashup.jsp trunk/mashup/java/modules/www/index.jsp trunk/mashup/java/modules/www/mashup.jsp trunk/mashup/java/modules/www/search.jsp trunk/mashup/java/modules/www/tag_cloud.jsp trunk/mashup/java/modules/www/user.jsp Added: trunk/mashup/java/modules/distribution/bin/native/serverdown.ico URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/bin/native/serverdown.ico?pathrev=18959 ============================================================================== Binary file. No diff available. Modified: trunk/mashup/java/modules/www/activity.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/activity.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/activity.jsp (original) +++ trunk/mashup/java/modules/www/activity.jsp Tue Jul 8 03:05:36 2008 @@ -87,7 +87,7 @@ if (action.equals("deleted")) { %> <%=result.getName()%> <% } else { %> - <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%> </a> <% } } Modified: trunk/mashup/java/modules/www/faulty_mashup.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/faulty_mashup.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/faulty_mashup.jsp (original) +++ trunk/mashup/java/modules/www/faulty_mashup.jsp Tue Jul 8 03:05:36 2008 @@ -26,7 +26,7 @@ <%@ include file="validate_login.jsp" %> <% - ResourceBundle bundle = ResourceBundle.getBundle("UI"); + ResourceBundle bundle = ResourceBundle.getBundle("UI"); String bounceback = request.getParameter("bounceback"); @@ -36,17 +36,23 @@ bounceback = URLDecoder.decode(bounceback, "UTF-8"); } - String path = request.getParameter("path"); - if (path == null) { - throw new RegistryException("must specify a path query parameter."); + String mashupOwner = request.getParameter("author"); + if (mashupOwner == null) { + throw new RegistryException("Must specify the Author"); } - String thisPage = "mashup.jsp?path=" + path; + String mashup = request.getParameter("mashup"); + if (mashup == null) { + throw new RegistryException("Must specify a Mashup"); + } - Resource resource = userRegistry.get(path); + // Constructing the path using the mashup owner and the name of the mashup + String path = RegistryConstants.PATH_SEPARATOR + "mashups" + RegistryConstants.PATH_SEPARATOR + + mashupOwner + RegistryConstants.PATH_SEPARATOR + mashup; - String[] parts = path.split(RegistryConstants.PATH_SEPARATOR); - String mashup = parts[parts.length - 1]; + String thisPage = "mashup.jsp?author=" + mashupOwner + "&mashup=" + mashup; + + Resource resource = userRegistry.get(path); String author = resource.getAuthorUserName(); String authorFullName = RegistryUtils.getFullName(request, author); Modified: trunk/mashup/java/modules/www/index.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/index.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/index.jsp (original) +++ trunk/mashup/java/modules/www/index.jsp Tue Jul 8 03:05:36 2008 @@ -306,7 +306,7 @@ if (action.equals("deleted")) { %> <%=result.getName()%> <% } else { %> - <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%></a> <% } if (action.equals("rated")) { %> <%=result.getContentString() %> stars @@ -339,7 +339,7 @@ result.getAuthor())%></a> (<%=result.getAuthor()%>) </td> <td nowrap> - <a href="mashup.jsp?path=<%=result.getPath()%>"><%=mashupName%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=mashupName%></a> </td> <td class="desc" colspan="2"> <%=result.getContentString() %> @@ -351,7 +351,7 @@ %> <tr class="results"> <td class="left" width="1" nowrap> - <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%></a> </td> <td nowrap> <a href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils.getFullName(request, Modified: trunk/mashup/java/modules/www/mashup.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/mashup.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/mashup.jsp (original) +++ trunk/mashup/java/modules/www/mashup.jsp Tue Jul 8 03:05:36 2008 @@ -36,21 +36,28 @@ <!--Required to keep a user logged in if 'Remember Me' option is selected--> <%@ include file="validate_login.jsp" %> -<% +<% ResourceBundle bundle = ResourceBundle.getBundle("UI"); String currentUser = RegistryUtils.getCurrentUser(userRegistry); - String path = request.getParameter("path"); - if (path == null) { - throw new RegistryException("must specify a path query parameter."); + String mashupOwner = request.getParameter("author"); + if (mashupOwner == null) { + throw new RegistryException("Must specify the Author"); } - String thisPage = "mashup.jsp?path=" + path; - Resource resource = userRegistry.get(path); + String mashup = request.getParameter("mashup"); + if (mashup == null) { + throw new RegistryException("Must specify a Mashup"); + } - String[] parts = path.split(RegistryConstants.PATH_SEPARATOR); - String mashup = parts[parts.length - 1]; + // Constructing the path using the mashup owner and the name of the mashup + String path = RegistryConstants.PATH_SEPARATOR + "mashups" + RegistryConstants.PATH_SEPARATOR + + mashupOwner + RegistryConstants.PATH_SEPARATOR + mashup; + + String thisPage = "mashup.jsp?author=" + mashupOwner + "&mashup=" + mashup; + + Resource resource = userRegistry.get(path); String author = resource.getAuthorUserName(); String authorFullName = RegistryUtils.getFullName(request, author); @@ -164,7 +171,7 @@ var path = $('addtag_path').value; var tagger = $('addtag_tagger').value; $('tags_area').style.cursor = "progress"; - + new Ajax.Request("ajax_tag.jsp?path=" + path + "&tagger=" + tagger, { method: "post", contentType: "text/html", @@ -210,7 +217,7 @@ key = e.which; //firefox var isEnter = (key == 13); - if (isEnter) addTag(); + if (isEnter) addTag(); } function addComment() { @@ -298,7 +305,7 @@ params[0] = pageElementId; params[1] = transportName; params[2] = serviceName; - + wso2.mashup.services.enableServiceTransport(serviceName, transportName, params, enableTransportCallback); } @@ -327,7 +334,7 @@ params[0] = pageElementId; params[1] = transportName; params[2] = serviceName; - + wso2.mashup.services.disableServiceTransport(serviceName, transportName, params, disableTransportCallback); } Modified: trunk/mashup/java/modules/www/search.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/search.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/search.jsp (original) +++ trunk/mashup/java/modules/www/search.jsp Tue Jul 8 03:05:36 2008 @@ -272,7 +272,7 @@ Iterator iter = results.getResults().iterator(); if (results.getResultsType().equals("resource") && iter.hasNext()) { QueryResult result = (QueryResult) iter.next(); - response.sendRedirect("mashup.jsp?path=" + result.getPath()); + response.sendRedirect("mashup.jsp?author=" + result.getAuthor() + "&mashup=" + result.getName()); } } } @@ -356,7 +356,7 @@ URL mashupLink = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), - "/mashup.jsp?path=" + result.getPath()); + "/mashup.jsp?author=" + result.getAuthor() + "&mashup=" + result.getName()); entryLink = mashupLink.toString(); entryDate = today; entryAuthor = bundle.getString("main.title"); @@ -998,7 +998,7 @@ <% if (action.equals("deleted")) { %> <%=result.getName()%> <% } else { %> - <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%></a> <% } if (action.equals("rated")) { %> <%=result.getContentString() %> stars @@ -1031,7 +1031,7 @@ result.getAuthor())%></a> (<%=result.getAuthor()%>) </td> <td nowrap> - <a href="mashup.jsp?path=<%=result.getPath()%>"><%=mashupName%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=mashupName%></a> </td> <td class="desc" colspan="2"> <%=result.getContentString() %> @@ -1042,7 +1042,7 @@ %> <tr class="results"> <td width="12%" nowrap> - <a href="mashup.jsp?path=<%=result.getPath()%>"><%=result.getName()%></a> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%></a> </td> <td nowrap> <a class="updatableName" Modified: trunk/mashup/java/modules/www/tag_cloud.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/tag_cloud.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/tag_cloud.jsp (original) +++ trunk/mashup/java/modules/www/tag_cloud.jsp Tue Jul 8 03:05:36 2008 @@ -28,20 +28,29 @@ <%@ include file="validate_login.jsp" %> <% - ResourceBundle bundle = ResourceBundle.getBundle("UI"); + ResourceBundle bundle = ResourceBundle.getBundle("UI"); - User userProfile = RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(userRegistry), userRegistry); + User userProfile = + RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(userRegistry), userRegistry); - String mashupPath = request.getParameter("path"); - if (mashupPath == null) { - throw new RegistryException("must specify a path query parameter."); + String mashupOwner = request.getParameter("author"); + if (mashupOwner == null) { + throw new RegistryException("Must specify the Author"); } - String thisPage = "mashup.jsp?path=" + mashupPath; - Resource resource = userRegistry.get(mashupPath); + String mashup = request.getParameter("mashup"); + if (mashup == null) { + throw new RegistryException("Must specify a Mashup"); + } + + // Constructing the path using the mashup owner and the name of the mashup + String path = RegistryConstants.PATH_SEPARATOR + "mashups" + RegistryConstants.PATH_SEPARATOR + + mashupOwner + RegistryConstants.PATH_SEPARATOR + mashup; + + String thisPage = "mashup.jsp?author=" + mashupOwner + "&mashup=" + mashup; + - String[] parts = mashupPath.split(RegistryConstants.PATH_SEPARATOR); - String mashup = parts[parts.length - 1]; + Resource resource = userRegistry.get(path); String author = resource.getAuthorUserName(); String authorFullName = RegistryUtils.getFullName(request, author); @@ -67,36 +76,40 @@ <div id="page"> -<%@ include file="header.jsp" %> + <%@ include file="header.jsp" %> -<div id="content"> -<div class="search"> - <%@ include file="searchbox.jsp" %> -</div> -<br /> -<div class="page_title">Popular tags</div> -<br /> -<div class="detail-section" style="height:400px; "> -<div class="link-cloud" id="tags"> -<% org.wso2.registry.Tag[] t = userRegistry.getTags(resource.getPath()); - if (t.length == 0) { %> - -none- -<% } - for (int i = 0; i < t.length; i++) { - Tag tag = t[i]; - String name = tag.getTagName(); - long tCount=tag.getTagCount(); - -%> - <a href="search.jsp?for=<%=name%>&scope=all&tags=true" class="link-cloud<%=tCount%>"><%=name%></a> - -<% } %> + <div id="content"> + <div class="search"> + <%@ include file="searchbox.jsp" %> + </div> + <br/> + + <div class="page_title">Popular tags</div> + <br/> + + <div class="detail-section" style="height:400px; "> + <div class="link-cloud" id="tags"> + <% org.wso2.registry.Tag[] t = userRegistry.getTags(resource.getPath()); + if (t.length == 0) { %> + -none- + <% } + for (int i = 0; i < t.length; i++) { + Tag tag = t[i]; + String name = tag.getTagName(); + long tCount = tag.getTagCount(); + + %> + <a href="search.jsp?for=<%=name%>&scope=all&tags=true" + class="link-cloud<%=tCount%>"><%=name%> + </a> + + <% } %> </div> -</div> -</div> -<br/> -<%@ include file="footer.jsp" %> + </div> + </div> + <br/> + <%@ include file="footer.jsp" %> </div> </body> Modified: trunk/mashup/java/modules/www/user.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/user.jsp?rev=18959&r1=18958&r2=18959&view=diff ============================================================================== --- trunk/mashup/java/modules/www/user.jsp (original) +++ trunk/mashup/java/modules/www/user.jsp Tue Jul 8 03:05:36 2008 @@ -403,7 +403,7 @@ %> <tr class="results"> <td width="1" class="left" nowrap> - <a href="mashup.jsp?path=<%=result.getPath()%>"><%=result.getName()%> + <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%> </a> </td> <td nowrap> _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
