Author: tyrell
Date: Fri Jan 18 02:11:14 2008
New Revision: 12472
Log:
Making taskbar.jsp self sustained, so that we can invoke it with parameters.
Changing includes where necessary.
Modified:
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/signout.jsp
trunk/mashup/java/modules/www/taskbar.jsp
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Fri Jan 18 02:11:14 2008
@@ -91,12 +91,6 @@
<%
User userProfile =
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(registry), registry);
-
- //Setting variables required for the taskbar.jsp
- String author = "";
- String currentUser = RegistryUtils.getCurrentUser(registry);
- String mashupServiceName = "";
- String path = "";
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -214,7 +208,7 @@
<%@ include file="searchbox.jsp" %>
<div id="taskbar">
- <%@ include file="taskbar.jsp" %>
+ <jsp:include page="taskbar.jsp"/>
</div>
<%@ include file="welcome.jsp" %>
@@ -297,7 +291,7 @@
while (iter.hasNext()) {
QueryResult result = (QueryResult) iter.next();
String id = "id" + nextId;
- path = result.getPath();
+ String path = result.getPath();
if (results.getResultsType().equals("activity")) {
String action = result.getAction();
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Fri Jan 18 02:11:14 2008
@@ -236,6 +236,7 @@
<jsp:param name="currentUser" value="<%=currentUser%>"/>
<jsp:param name="mashupServiceName" value="<%=mashupServiceName%>"/>
<jsp:param name="path" value="<%=path%>"/>
+ <jsp:param name="thisPage" value="<%=thisPage%>"/>
</jsp:include>
</div>
Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp (original)
+++ trunk/mashup/java/modules/www/signout.jsp Fri Jan 18 02:11:14 2008
@@ -58,6 +58,8 @@
String bounceback = request.getParameter("bounceback");
if (bounceback == null) bounceback = "index.jsp";
+ Registry registry = RegistryUtils.getRegistry(request);
+
/*
// If infocard authentication has been used, get information that way.
String auth = (String)
request.getAttribute(TokenVerifierConstants.SERVLET_ATTR_STATE);
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Fri Jan 18 02:11:14 2008
@@ -13,12 +13,62 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
+<%@ page import="com.sun.syndication.feed.synd.SyndContent" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndContentImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntry" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntryImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeed" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeedImpl" %>
+<%@ page import="com.sun.syndication.io.SyndFeedOutput" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.MashupFault" %>
+<%@ page import="org.wso2.mashup.utils.MashupUtils" %>
+<%@ page import="org.wso2.mashup.utils.QueryResult" %>
+<%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
+<%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
+<%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.Comment" %>
+<%@ page import="org.wso2.registry.Registry" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.RegistryException" %>
+<%@ page import="org.wso2.registry.Resource" %>
+<%@ page import="org.wso2.registry.Tag" %>
+<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
+<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
+<%@ page import="org.wso2.usermanager.Realm" %>
+<%@ page import="org.wso2.usermanager.UserManagerException" %>
+<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
+<%@ page import="org.wso2.utils.ServerConfiguration" %>
+<%@ page import="org.wso2.wsas.ServerManager" %>
+<%@ page import="javax.servlet.ServletContext" %>
+<%@ page import="java.io.BufferedReader" %>
+<%@ page import="java.io.FileReader" %>
+<%@ page import="java.net.URL" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+
<%
//Setting variables required for the taskbar.jsp
String paramAuthor = request.getParameter("paramAuthor");
String paramCurrentUser = request.getParameter("paramCurrentUser");
String paramMashupServiceName =
request.getParameter("paramMashupServiceName");
String paramPath = request.getParameter("paramPath");
+
+ String thisPage = request.getParameter("thisPage");
+ if(thisPage == null){
+ thisPage = "index.jsp";
+ }
+
+ Registry registry = RegistryUtils.getRegistry(request);
%>
<table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
<tr>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
