shuber 2004/09/22 15:41:14 CEST
Modified files:
war/src/webapp/jsp bmk_info.jsp cancel_move.jsp
confirm_bmk_remove.jsp
confirm_cat_remove.jsp error_page.jsp
menu.jsp message.jsp new_cat_warning.jsp
save_new_bmk.jsp save_new_cat.jsp
template.jsp update_bmk.jsp
update_cat.jsp update_cat_warning.jsp
workspace.jsp
Log:
Changed all useBean tags to use only fully qualified class names as required by the
spec.
Revision Changes Path
1.2 +3 -3 bookmark/war/src/webapp/jsp/bmk_info.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/bmk_info.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/cancel_move.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/cancel_move.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/confirm_bmk_remove.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/confirm_bmk_remove.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/confirm_cat_remove.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/confirm_cat_remove.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/error_page.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/error_page.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -6 bookmark/war/src/webapp/jsp/menu.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/menu.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 bookmark/war/src/webapp/jsp/message.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/message.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/new_cat_warning.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/new_cat_warning.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/save_new_bmk.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/save_new_bmk.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/save_new_cat.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/save_new_cat.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4 bookmark/war/src/webapp/jsp/template.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/template.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 bookmark/war/src/webapp/jsp/update_bmk.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/update_bmk.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/update_cat.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/update_cat.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 bookmark/war/src/webapp/jsp/update_cat_warning.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/update_cat_warning.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -5 bookmark/war/src/webapp/jsp/workspace.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/bookmark/war/src/webapp/jsp/workspace.jsp.diff?r1=1.1&r2=1.2&f=h
Index: bmk_info.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/bmk_info.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmk_info.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ bmk_info.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,6 +1,6 @@
-<jsp:useBean id="contextId" class="String" scope="request"/>
-<jsp:useBean id="bmkTitle" class="String" scope="request"/>
-<jsp:useBean id="bmkUrl" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bmkTitle" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bmkUrl" class="java.lang.String" scope="request"/>
<script language="JavaScript">
function bmk<%=contextId%>_check(action, time, bmkId) {
Index: cancel_move.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/cancel_move.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cancel_move.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ cancel_move.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: confirm_bmk_remove.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/confirm_bmk_remove.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm_bmk_remove.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ confirm_bmk_remove.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: confirm_cat_remove.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/confirm_cat_remove.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm_cat_remove.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ confirm_cat_remove.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: error_page.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/error_page.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error_page.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ error_page.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,4 +1,4 @@
-<jsp:useBean id="message" class="String" scope="request"/>
+<jsp:useBean id="message" class="java.lang.String" scope="request"/>
<table border="0" width="100%">
<tr>
Index: menu.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/menu.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ menu.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,8 +1,8 @@
<%@ page language="java"
import="org.jahia.webapps.bookmark.model.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
-<jsp:useBean id="bmkWorkspace" class="BookmarkManager" scope="session"/>
-<jsp:useBean id="catBuffer" class="Vector" scope="session"/>
-<jsp:useBean id="bmkBuffer" class="Vector" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bmkWorkspace"
class="org.jahia.webapps.bookmark.model.BookmarkManager" scope="session"/>
+<jsp:useBean id="catBuffer" class="java.util.Vector" scope="session"/>
+<jsp:useBean id="bmkBuffer" class="java.util.Vector" scope="session"/>
<% String contextPath = request.getContextPath(); %>
@@ -37,7 +37,7 @@
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="2"></nobr>
<% }
} else { %>
-<jsp:useBean id="catAction" class="String" scope="session"/>
+<jsp:useBean id="catAction" class="java.lang.String" scope="session"/>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<% if (bmkWorkspace.isInCopy(bmkWorkspace.getSelectedCategory(),
Category.getClassName())) { %>
<font class="bmkDisabled"> Paste Category </font>
@@ -64,7 +64,7 @@
<a href="javascript:bmk<%=contextId%>_sendBookmarkForm('copy_bookmarks',
'<%=Tools.getTime()%>','','')" class="waMenu"> Copy Bookmark(s) </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="2"></nobr>
<% } else { %>
-<jsp:useBean id="bmkAction" class="String" scope="session"/>
+<jsp:useBean id="bmkAction" class="java.lang.String" scope="session"/>
<nobr><img src="<%=contextPath%>/images/spacer.gif" width="3" height="13">
<a href="javascript:bmk<%=contextId%>_sendBookmarkForm('paste_bookmarks',
'<%=Tools.getTime()%>','','')" class="waMenu"> Paste Bookmark(s) </a>
<img src="<%= contextPath%>/images/spacer.gif" width="3" height="2"></nobr>
Index: message.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/message.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- message.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ message.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,7 +1,7 @@
<[EMAIL PROTECTED] language="java" import="org.jahia.tools.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
-<jsp:useBean id="message" class="String" scope="request"/>
-<jsp:useBean id="nextAction" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
+<jsp:useBean id="message" class="java.lang.String" scope="request"/>
+<jsp:useBean id="nextAction" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: new_cat_warning.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/new_cat_warning.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- new_cat_warning.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ new_cat_warning.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: save_new_bmk.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/save_new_bmk.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- save_new_bmk.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ save_new_bmk.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: save_new_cat.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/save_new_cat.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- save_new_cat.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ save_new_cat.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: template.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/template.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ template.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -4,10 +4,10 @@
<title>Bookmark portlet</title>
</head>
<%@ page language="java"
import="org.jahia.webapps.bookmark.model.*,org.jahia.webapps.bookmark.db.*,org.jahia.webapps.bookmark.controller.*,org.jahia.tools.*,java.util.*"
%>
-<jsp:useBean id="JAHIA" class="String" scope="session"/>
-<jsp:useBean id="nextPage" class="String" scope="request"/>
-<jsp:useBean id="buttonPage" class="String" scope="request"/>
-<jsp:useBean id="bmkUser" class="String" scope="session"/>
+<jsp:useBean id="JAHIA" class="java.lang.String" scope="session"/>
+<jsp:useBean id="nextPage" class="java.lang.String" scope="request"/>
+<jsp:useBean id="buttonPage" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bmkUser" class="java.lang.String" scope="session"/>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0">
<% if (JAHIA.equals("false")) { %>
Index: update_bmk.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/update_bmk.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update_bmk.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ update_bmk.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
-<jsp:useBean id="selectedBmkId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
+<jsp:useBean id="selectedBmkId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: update_cat.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/update_cat.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update_cat.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ update_cat.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: update_cat_warning.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/update_cat_warning.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update_cat_warning.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ update_cat_warning.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java" import="org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="contextId" class="String" scope="request"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
<% String contextPath = request.getContextPath(); %>
Index: workspace.jsp
===================================================================
RCS file: /home/cvs/repository/bookmark/war/src/webapp/jsp/workspace.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.jsp 13 Sep 2004 13:25:34 -0000 1.1
+++ workspace.jsp 22 Sep 2004 13:41:13 -0000 1.2
@@ -1,9 +1,9 @@
<%@ page language="java" import="org.jahia.webapps.bookmark.model.*" %>
-<jsp:useBean id="bmkWorkspace" class="BookmarkManager" scope="session"/>
-<jsp:useBean id="iconsPath" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="request"/>
-<jsp:useBean id="bmk_servletURI" class="String" scope="session"/>
-<jsp:useBean id="buttonPage" class="String" scope="request"/>
+<jsp:useBean id="bmkWorkspace"
class="org.jahia.webapps.bookmark.model.BookmarkManager" scope="session"/>
+<jsp:useBean id="iconsPath" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bmk_servletURI" class="java.lang.String" scope="session"/>
+<jsp:useBean id="buttonPage" class="java.lang.String" scope="request"/>
<script language="javascript">
var viaFunction = 0;
