shuber 2004/09/22 15:34:08 CEST
Modified files:
war/src/webapp/jsp admin.jsp delete_cat.jsp
delete_cat_bottom.jsp delete_form.jsp
delete_form_bottom.jsp display.jsp
edit_cat.jsp edit_cat_bottom.jsp
edit_form.jsp edit_form_bottom.jsp
manage_cat.jsp menu.jsp roles.jsp
search.jsp template.jsp view_contact.jsp
Log:
Changed all useBean tags to use only fully qualified class names as required by the
spec.
Revision Changes Path
1.2 +2 -2 addressbook/war/src/webapp/jsp/admin.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/admin.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 addressbook/war/src/webapp/jsp/delete_cat.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/delete_cat.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 addressbook/war/src/webapp/jsp/delete_cat_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/delete_cat_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/delete_form.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/delete_form.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 addressbook/war/src/webapp/jsp/delete_form_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/delete_form_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -6 addressbook/war/src/webapp/jsp/display.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/display.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/edit_cat.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/edit_cat.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/edit_cat_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/edit_cat_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -6 addressbook/war/src/webapp/jsp/edit_form.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/edit_form.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 addressbook/war/src/webapp/jsp/edit_form_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/edit_form_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/manage_cat.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/manage_cat.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4 addressbook/war/src/webapp/jsp/menu.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/menu.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 addressbook/war/src/webapp/jsp/roles.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/roles.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/search.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/search.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 addressbook/war/src/webapp/jsp/template.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/template.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4 addressbook/war/src/webapp/jsp/view_contact.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/addressbook/war/src/webapp/jsp/view_contact.jsp.diff?r1=1.1&r2=1.2&f=h
Index: admin.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/admin.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admin.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ admin.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page language="java" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<% String contextPath = request.getContextPath(); %>
<table border="0" cellspacing="0" cellpadding="0" class="waBG">
<form name="adminForm<%=contextId%>" action="<%= response.encodeURL(servlet) %>"
method ="post">
Index: delete_cat.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/delete_cat.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_cat.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ delete_cat.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true"
import="java.util.*,org.jahia.webapps.addressbook.*,org.jahia.tools.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
String catId = (String)request.getAttribute("cat_id");
String catName = (String)request.getAttribute("cat_name");
Index: delete_cat_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/delete_cat_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_cat_bottom.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ delete_cat_bottom.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<[EMAIL PROTECTED] language="java" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
String contextPath = request.getContextPath();
String catId = (String) request.getAttribute("cat_id");
Index: delete_form.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/delete_form.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_form.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ delete_form.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="contact_name" class="String" scope="request"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contact_name" class="java.lang.String" scope="request"/>
<table border="0" cellspacing="0" cellpadding="10" width="100%">
<tr>
<td width="100%" class="waNormal" align="center">
Index: delete_form_bottom.jsp
===================================================================
RCS file:
/home/cvs/repository/addressbook/war/src/webapp/jsp/delete_form_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_form_bottom.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ delete_form_bottom.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
String contextPath = request.getContextPath();
String contactId = request.getParameter("contact_id");
Index: display.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/display.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ display.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,10 +1,10 @@
<%@ page language="java"
import="org.jahia.tools.*,org.jahia.webapps.addressbook.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="myBook" class="AddressBook" scope="session"/>
-<jsp:useBean id="sortOrder" class="String" scope="session"/>
-<jsp:useBean id="searchWord" class="String" scope="session"/>
-<jsp:useBean id="field" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="myBook" class="org.jahia.webapps.addressbook.AddressBook"
scope="session"/>
+<jsp:useBean id="sortOrder" class="java.lang.String" scope="session"/>
+<jsp:useBean id="searchWord" class="java.lang.String" scope="session"/>
+<jsp:useBean id="field" class="java.lang.String" scope="session"/>
<script language="javascript">
function search<%=contextId%> (field) {
Index: edit_cat.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/edit_cat.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_cat.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ edit_cat.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page language="java" import="org.jahia.webapps.addressbook.*,java.util.*" %>
-<jsp:useBean id="currentAction" class="String" scope="request"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="currentAction" class="java.lang.String" scope="request"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
int catId = -1;
String catName = "";
Index: edit_cat_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/edit_cat_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_cat_bottom.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ edit_cat_bottom.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,7 +1,7 @@
<[EMAIL PROTECTED] language="java" %>
-<jsp:useBean id="currentAction" class="String" scope="request"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="currentAction" class="java.lang.String" scope="request"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
int catId = -1;
if (currentAction.equals("rename_cat")) {
Index: edit_form.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/edit_form.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_form.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ edit_form.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,10 +1,10 @@
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="myBook" class="AddressBook" scope="session"/>
-<jsp:useBean id="contact" class="Contact" scope="session"/>
-<jsp:useBean id="companies" class="Vector" scope="request"/>
-<jsp:useBean id="countries" class="Vector" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="myBook" class="org.jahia.webapps.addressbook.AddressBook"
scope="session"/>
+<jsp:useBean id="contact" class="org.jahia.webapps.addressbook.Contact"
scope="session"/>
+<jsp:useBean id="companies" class="java.util.Vector" scope="request"/>
+<jsp:useBean id="countries" class="java.util.Vector" scope="session"/>
<%
Boolean incorrectForm = (Boolean) pageContext.findAttribute("incorrectForm");
String context_path = request.getContextPath();
Index: edit_form_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/edit_form_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_form_bottom.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ edit_form_bottom.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<[EMAIL PROTECTED] language="java" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
<%
String contextPath = request.getContextPath();
String currentAction = (String) request.getAttribute("currentAction");
Index: manage_cat.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/manage_cat.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manage_cat.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ manage_cat.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page buffer="none" session="true"
import="java.util.*,org.jahia.webapps.addressbook.*,org.jahia.tools.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="myBook" class="AddressBook" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="myBook" class="org.jahia.webapps.addressbook.AddressBook"
scope="session"/>
<%
String contextPath = request.getContextPath();
Vector categories = myBook.getCategories();
Index: menu.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/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 12:53:17 -0000 1.1
+++ menu.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,8 +1,8 @@
<%@ page buffer="none" session="true"
import="org.jahia.tools.*,org.jahia.webapps.addressbook.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="nextPage" class="String" scope="request"/>
-<jsp:useBean id="myBook" class="AddressBook" scope="session"/>
-<jsp:useBean id="role" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="nextPage" class="java.lang.String" scope="request"/>
+<jsp:useBean id="myBook" class="org.jahia.webapps.addressbook.AddressBook"
scope="session"/>
+<jsp:useBean id="role" class="java.lang.String" scope="session"/>
<% String contextPath = request.getContextPath(); %>
<table width="100%">
<tr>
Index: roles.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/roles.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roles.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ roles.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="role" class="String" scope="session"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="role" class="java.lang.String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<table>
<tr>
<form action="<%=response.encodeURL(servlet)%>" method="post">
Index: search.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/search.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ search.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page buffer="none" session="true" import="org.jahia.tools.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="searchWord" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="searchWord" class="java.lang.String" scope="session"/>
<% String contextPath = request.getContextPath(); %>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
Index: template.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/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 12:53:17 -0000 1.1
+++ template.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -3,9 +3,9 @@
<title>AddressBook portlet</title>
</head>
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="role" class="String" scope="session"/>
-<jsp:useBean id="nextPage" class="String" scope="request"/>
-<jsp:useBean id="bottomPage" class="String" scope="request"/>
+<jsp:useBean id="role" class="java.lang.String" scope="session"/>
+<jsp:useBean id="nextPage" class="java.lang.String" scope="request"/>
+<jsp:useBean id="bottomPage" class="java.lang.String" scope="request"/>
<%
Boolean isManager = (Boolean) pageContext.findAttribute("isManager");
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
Index: view_contact.jsp
===================================================================
RCS file: /home/cvs/repository/addressbook/war/src/webapp/jsp/view_contact.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- view_contact.jsp 13 Sep 2004 12:53:17 -0000 1.1
+++ view_contact.jsp 22 Sep 2004 13:34:07 -0000 1.2
@@ -1,8 +1,8 @@
<%@ page language="java"
import="org.jahia.webapps.addressbook.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="contact" class="Contact" scope="session"/>
-<jsp:useBean id="myBook" class="AddressBook" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="contact" class="org.jahia.webapps.addressbook.Contact"
scope="session"/>
+<jsp:useBean id="myBook" class="org.jahia.webapps.addressbook.AddressBook"
scope="session"/>
<%
String contextPath = request.getContextPath();
String category = myBook.getCatName(contact.getCategory());
